Changed to latest code base; Added Login page changes
Merge branch 'master' of https://github.com/palanii/Crisis_Management

Conflicts:
	app/styles/css/sass/_colors.sass