changing login from host to domain
Merge branch 'develop' into feature/login
fb features
Merge branch 'develop' into feature/login

Conflicts:
	src/main/php/smarty/frontpage.tpl
Merge branch 'develop' of github.com:webhat/Working-Title into feature/login
afbinden
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