*added house
Merge branch 'master' of https://github.com/reavel/UnityGame

Conflicts:
	Unity/Library/CurrentLayout.dwlt
	Unity/Library/assetDatabase3