Feature 6, na release 0.1
Merge branch 'feature6' into develop
Merge branch 'release-0.1' into develop
Change 1
Change 2
Change 3
Change 4
Merge branch 'develop' of https://github.com/mvgorp/emaho into develop

Conflicts:
	feature1.php
Merge branch 'change4' into develop
Change 5
Change 5-1
Change 5-2
Merge branch 'develop'

* develop:
  Change 5-2
  Change 5-1
  Change 5
  Merge branch 'develop' of https://github.com/mvgorp/emaho into develop
  Change 4
  Change 3
  Change 2
  Change 1
  Feature 6, na release 0.1