Merge branch 'master' of github.com:RolandsZeps/designfabrik

Conflicts:
	README.md
Merge branch 'master' of github.com:RolandsZeps/designfabrik

Conflicts:
	README.md