Login function
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel_buddy/src/main/webapp/travel/app/js/controllers.js
Solve conflicts