edit php settings on .htaccess
Merge branch 'develop'