hotfix-1.0.1
Merge branch 'hotfix/hotfix-1.0.1' into develop

* hotfix/hotfix-1.0.1:
  hotfix-1.0.1

Conflicts:
	index.php
no message