Moved .htaccess to apache2.conf
Merge remote-tracking branch 'origin/master' into develop
Added cache-busting