Remote search selection, style changes
Merge branch 'master' into remote_search_select_source

Conflicts:
	static/css/main.css.map
	templates/_media.html