Fixed some merge conflicts with the elmarkou updates. Minor conflicts, we both fixed spelling and grammar mistakes at the same time :-)

data/interfaces/default/index.html

@@ -53,7 +53,7 @@
 				
 			%>
 			<tr class="grade${grade}">
-				<td id="albumart"><div id="artistImg"><img class="albumArt" src="http://ec1.images-amazon.com/images/P/${artist['AlbumID']}.01.MZZZZZZZ.jpg" height="50" width="50"></div></td>
+				<td id="albumart"><div id="artistImg"><img class="albumArt"/></div></td>
 				<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}" title="${artist['ArtistID']}">${artist['ArtistName']}</a></td>
 				<td id="status">${artist['Status']}</td>
 				<td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td>

data/interfaces/default/manage.html

@@ -1,4 +1,4 @@
-lossless<%inherit file="base.html" />
+<%inherit file="base.html" />
 <%!
 	import headphones
 	from headphones.helpers import checked

data/interfaces/default/manageartists.html

@@ -1,4 +1,4 @@
-lossless<%inherit file="base.html" />
+<%inherit file="base.html" />
 
 
 

data/interfaces/default/managenew.html

@@ -1,4 +1,4 @@
-lossless<%inherit file="base.html" />
+<%inherit file="base.html" />
 <%!
 	import headphones
 %>

data/interfaces/default/upcoming.html

@@ -1,4 +1,14 @@
-lossless<%inherit file="base.html" />
+<%inherit file="base.html" />
+
+<%def name="headerIncludes()">
+	<div id="subhead_container">
+		<div id="subhead_menu">
+			<a href="#" id="menu_link_scan" onclick="doAjaxCall('forceSearch',$(this))" data-success="Checking for wanted albums successful" data-error="Error checking wanted albums">Force Check</a>
+		</div>
+	</div>	
+</%def>
+
+
 <%def name="body()">
 	
 	<div class="title">
@@ -88,6 +98,7 @@ lossless<%inherit file="base.html" />
 			"bPaginate": false
 		});
 		resetFilters("artists");
+		initActions();
 	}
 	$(document).ready(function() {
 		initThisPage();