Merge test
Merge branch 'master' of https://github.com/andallas/Wopen

Conflicts:
	Assets/Concept/Design Doc.txt