Merge branch 'hotfix/fbloginhide'
Merge branch 'release/v1.13'
hotfixes
Merge branch 'master' into develop
Merge branch 'master' into develop

Conflicts:
	src/main/html/login.html