Merge branch 'master' of github.com:MikroAcse/Garden-XE

Conflicts:
	README.md
Merge branch 'master' of github.com:MikroAcse/Garden-XE

Conflicts:
	README.md