Merge branch 'develop' into login
post things added to login and unlockDoor
Merge branch 'login' into develop