Merge branch 'hotfix/1.0.1' into develop
Merge branch 'hotfix/1.0.2' into develop
Merge branch 'master' into develop
Removed now unused images
Merge branch 'master' into develop
Use /var/www/htdocs as webroot for Magento
Merge branch 'release/1.0.2'