close #49
Merge remote-tracking branch 'origin/master'

Conflicts:

	webapp/src/com/naukma/cauliflower/controllers/ChangeCustomerPassword.java
Merge branch 'master' of https://github.com/worm1k/OSS_Cauliflower

Conflicts:
	webapp/web/cse_dashboard_user.jsp