new prefabs and colored stuff
t pMerge branch 'master' of https://github.com/DarkOmega/VRJam2014

Conflicts:
	VRJam2014/ProjectSettings/Physics2DSettings.asset