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 conversation template and Ctrl.coffee
ADDED css to conversation and message panels
ADDED route params to SearchCtrl and UserCtrl and ADDED link to user from search.
touched up some more css
Merge pull request #41 from josephktcheung/angular

Angular
Merge branch 'conversation-template' of github.com:Simon245/grasshopper into Simon245-conversation-template

RESOLVED Conflicts in	app/assets/javascripts/angular/angular_config.js.coffee.erb
Merge branch 'Simon245-conversation-template'
ADDED stub ConversationCtrl to angular
FIXED overflow in panel
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