remove cross domain
update login
search friends & search places
m
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/tripbookController.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	public/js/tripbookController.js
	public/js/userManager.js
	views/layout.jade