Merge branch 'master' into 'levi'

# Conflicts:
#   entrypoint.sh

entrypoint.sh

@@ -13,11 +13,14 @@ mkdir -p ARTWORKS/published
 # change owner to www-data
 chown -R www-data:www-data ARTWORKS
 
+# initialize database
+cat /database_init.php | php -d display_errors=on -d error_reporting=-1
+
 # substitute server name
 sed -i "s|ServerName|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
 
-# initialize database
-cat /database_init.php | php -d display_errors=on -d error_reporting=-1
+# remove index.html
+rm /var/www/html/index.html
 
 # start webserver
 /usr/sbin/apache2ctl -D FOREGROUND