Bunch of random stuff
Merge branch 'master' of https://github.com/zhanhuang/SuperMassiveBlackhole

Conflicts:
	Assets/Scenes/zhan_test.unity