Login form update
Login conflict
Merge branch 'development' of https://github.com/rspeerstra/project into development