CMS-814 Implement new Login screen
Revert "main" files
CMS-814 Implement new Login screen
- A bit closer to a layout solution
CMS-814 Implement new Login screen
Merge remote branch 'origin/master' into new-login

Conflicts:
	modules/wem-webapp/src/main/webapp/admin/resources/app/view/XTemplates.js
Merge remote branch 'origin/new-login'