merging with mike
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge

Conflicts:
	js/controllers/LoginController.js
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge
[delivers #62496668]Added current user logged in and image on main mobile nav, added a search function for users on admin side.