changing login from host to domain
Merge branch 'release/1.24' into develop
Merge branch 'develop' into feature/login
fb features
Merge branch 'hotfix/frankfeature' into develop
Merge branch 'develop' into feature/login

Conflicts:
	src/main/php/smarty/frontpage.tpl
mail msg [ci skip]
Merge branch 'develop' of github.com:webhat/Working-Title into develop
Merge branch 'develop' of github.com:webhat/Working-Title into feature/login
afbinden
Merge branch 'hotfix/hideprofile' into develop
mail update
Merge branch 'develop' of github.com:webhat/Working-Title into feature/login
FB login and lots more
ga for mandrill
Merge branch 'feature/login' into develop
fblogin v1.25
Merge branch 'release/v1.25'