Merge pull request #1 from schrockblock/feature/kevinchen93/login

Feature/kevinchen93/login
added todos
Merge branch 'develop' into feature/bo/changeprojectcolor