changed 418 to 401 for /user
updated search controller to correctly monitor SearchService
Merge branch 'loginButton' into dev

Conflicts:
	public/scripts/services/search.js