Merge pull request #4 from LAS-IT/develop

Develop
Merge pull request #6 from LAS-IT/develop

Develop
Update index.html.erb
Merge pull request #7 from LAS-IT/master

Merge master to develop due to hotfixes