No longer use $routeProvider
No longer use $routeProvider
Merge branch 'search-provider'

Conflicts:
	js/app/controllers/maincontroller.js
	js/app/factories/artists.js
	js/public/app.js