fix issue 2164 and issue 2182
Merge pull request #424 from timrae/studyOptionsFix

fix issue 2164 and issue 2182
Issue 2166
Merge pull request #425 from timrae/studyOptionsFix

Issue 2166
Updated translations
Bumped version to 2.2beta21
@branch-specific
Fix errors in 9aa5d9f
Merge pull request #426 from timrae/fixErrorsIn9aa5d9f

Fix errors in 9aa5d9f
Bumped version to 2.2beta22
@branch-specific
Fix showing of welcome screen on first app startup. Remove redundant code
Merge pull request #427 from timrae/welcomeScreen

Fix showing of welcome screen on first app startup
Bumped version to 2.2beta23
@branch-specific
Merged '73b3433' from develop: fix issue 2164 and issue 2182
Merged '362f3a3' from develop: Issue 2166
Merged '9fd83bf' from develop: Updated translations
Skipped '3370af8' from develop: Bumped version to 2.2beta21 @branch-specific
Merged 'b418d0a' from develop: Fix errors in 9aa5d9f
Skipped 'c00a6a3' from develop: Bumped version to 2.2beta22 @branch-specific
Merged '0a9494d' from develop: Fix showing of welcome screen on first app startup. Remove redundant code
Skipped '65a2ab8' from develop: Bumped version to 2.2beta23 @branch-specific