Merge branch 'feature/edit_user' into develop
Merge pull request #2 from iDevSchulz/develop

Merge branch 'feature/edit_user' into develop