Merge pull request #1 from hef/feature/readme

Feature/readme
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop'
made login screen more pretty
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' into develop

Conflicts:
	settings/base.py