Dan to make the search page work change APP.JS, CONTROLLER.JS, and SEARCH.HTML
no message
Everything before database.
Merge branch 'Suneil_Branch' into Dan_Branch

* Suneil_Branch:
  Everything before database.

Conflicts:
	www/artwork.json
	www/js/controllers.js
	www/partials/explore.html
	www/partials/search.html
	www/partials/test.html