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
UPDATED apprenticeship controller and json
UPDATED conversations controller and json
UPDATED messages controller and json
UPDATED messages controller, test and json
UPDATED ratings controller and json
UPDATED skills controller and json
UPDATED users controller and json
CHANGED involve_user to become scope method in apprenticeship and conversation models
ADDED about_me to users controller params, json and angular views
ADDED remove skill function
UPDATED height for conversation panels
ADDED search icon in header and REMOVED ApprenticeshipCtrl.
Merge pull request #42 from annieccheung/search_ui

Search ui
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular

RESOLVED Conflicts app/assets/javascripts/angular/controllers/UserCtrl.js.coffee
ADDED ui-bootstrap
Merge pull request #43 from josephktcheung/angular

Angular