backup
merged dev
Merge branch 'hotfix/fix-tos' into develop
Merge branch 'develop' into feature/SBP-339

Conflicts:
	Handler/LoginHandler.php
Merge branch 'feature/SBP-339' into develop
additional translations
Merge pull request #46 from RtxLabs/feature/ROC-630

additional translations
Merge branch 'release/1.0.2'