Merge pull request #111 from enviroCar/dev

Merge branch 'dev'
Merge pull request #3 from enviroCar/master

re-align
add password fields in user profile. fix PUT req
Merge remote-tracking branch 'origin/master'
Merge branch 'feature-update-user-profile'
Merge branch 'master' into feature-update-user-profile
Merge pull request #5 from enviroCar/dev

Dev
Merge branch 'feature-update-user-profile' into dev
Merge pull request #123 from matthesrieke/dev

Merge Password Change stuff into dev