Merge branch 'hotfix/1.0.1' into develop
Merge branch 'hotfix/minor-version' into develop
Fix of minor version number
Merge branch 'hotfix/1.0.2' into develop

Conflicts:
	index.php
Merge branch 'release/1.1.0'