Merge branch 'release/v1.10' into develop
Added locales: broken for en_GB
Merge branch 'develop' of github.com:webhat/Working-Title into develop
Hackedy hack...
FB Login
Highlight Example
Stub
Merge branch 'hotfix/noperiod' into develop

Conflicts:
	src/main/php/adduser.php
AB Testing FB
Merge branch 'hotfix/creationsbug' into develop
Merge branch 'hotfix/payments' into develop
Removed PHPThumb
Merge branch 'develop' of github.com:webhat/Working-Title into develop
header image
Fixed #112
Fixed #111
Fixed #115
Fixed #123
fix
image replace
Merge branch 'develop' of github.com:webhat/Working-Title into develop
Merge branch 'develop' of github.com:webhat/Working-Title into develop
fix