refactoring, adding app scope
Merge branch 'master' into refactoring

Conflicts:
	static/js/services/services.js
	templates/_media.html
	templates/partials/_search_bar.html
	templates/partials/remote_search_modal.html
Merge branch 'master' into refactoring
Started to add current search into state
Merge branch 'master' into refactoring

Conflicts:
	static/js/controllers/controllers.js
	templates/_media.html
Fixed general state problems.
Fixed remote search database selection state.
Fixed broken placeholders