close #24 end2end ready!)
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/src/com/naukma/cauliflower/controllers/LoginController.java