Merge branch 'master' into develop
Merge branch 'hotfix/app_logo_fix' into develop
some bugfixes for the phonegap version
improvements for timeline view
oAuth2
Merge branch 'feature/oauth2' into develop
Merge branch 'release/2.1'