#25 - Login screen fix: theming and fixed user menu.
Merge branch '25_task' into testing

Conflicts:
	sites/all/themes/lumi/styling/css/custom.css