REMOVED conditional in filterByNameOrSkill.
Merge pull request #39 from annieccheung/search_ui

REMOVED conditional in filterByNameOrSkill.
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular

RESOLVED conflicts in	app/views/layouts/application.html.slim &	app/views/site/index.html.slim
UPDATED SearchCtrl getCurrentUser to currentUser