Merge branch 'hotfix/twitter-fix'
Merge branch 'release/no-www'
make mod_rewrite not crash .... hopefully
Merge branch 'hotfix/500' into develop