REMOVED navbar search.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into search_ui

Removed commented out navbar search code

Conflicts:
	app/views/layouts/application.html.slim
ADDED route params to SearchCtrl and UserCtrl and ADDED link to user from search.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into search_ui

Conflicts:
	app/assets/javascripts/angular/controllers/SearchCtrl.coffee
	app/assets/javascripts/angular/controllers/UserCtrl.js.coffee
	app/assets/templates/search.html.slim
	app/assets/templates/view-profile.html.slim
ADDED search icon in header and REMOVED ApprenticeshipCtrl.
Merge pull request #42 from annieccheung/search_ui

Search ui