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

Conflicts:
	Handler/LoginHandler.php
Merge branch 'feature/SBP-339' into develop