Merge branch 'develop'
Fix htaccess with apache 2.4
Merge branch 'master' into develop