Added basic search bar and user#search controller + view
Merge branch 'master' of https://github.com/coderaven/activityOverlord

Conflicts:
	views/user/search.ejs