Merge branch 'hotfix/v1.0.4'
GNR-3 optimized login and bugfixed data handling
Merge branch 'hotfix/v1.0.5' into develop