technical
Merge branch 'master' of https://github.com/brainysmith/idm-blitz

Conflicts:
	.idea/ant.xml
Merge branch 'master' of https://github.com/brainysmith/idm-blitz

Conflicts:
	.idea/ant.xml
Merge branch 'master' of https://github.com/brainysmith/idm-blitz
Merge branch 'master' of https://github.com/brainysmith/idm-blitz

Conflicts:
	.idea/ant.xml
Merge branch 'master' of https://github.com/brainysmith/idm-blitz

Conflicts:
	.idea/ant.xml
	web-login/app/controllers/Login.scala