updates
added edit profile page and styled register page
Merge branch 'editProfile' into masterEditProfileMerge
wohf
added edit profile page and minor styling
logout
photo update
Merge branch 'design'
initial search
got modals to work
update
Merge branch 'masterEditProfileMerge' of https://github.com/richmondwatkins/lovehub into design

Conflicts:
	app/less/app.less
	app/lib/init-routes.js
	app/views/shared/template.jade
	app/views/users/new.jade
	app/views/users/show.jade
update