#08.04.2014
Merge remote-tracking branch 'origin/v1.5' into develop

Conflicts:
	README.md
Merge branch 'develop' of https://github.com/one-more/peach into develop
#13.04.2014