Merge branch 'develop' into feature-pre-registration-user
Confirmation of E-Mail and Login with auth_token
Merge branch 'feature-pre-registration-user' into develop