Merge branch 'master' of https://github.com/ConnyBurman/Design.git

Conflicts:
	Design/Design.proj
Merge branch 'master' of https://github.com/swensk/Design.git