merging changes
Changes to Login
Login changes
Added some eye candy to login
Improved look and feel
Login changes
Login changes
Login changes
Login changes
Login changes
Login changes
Login changes
Login changes2
Fixed organisationunit completeness for multiple levels below selected organisationunits
Merge branch 'master' into development

Conflicts:
	composer.phar
	web/css/bootstrap.css
	web/css/bootstrap_form_2.css
Merge remote-tracking branch 'origin/master' into development