.
Merge branch 'master' of https://github.com/seurhe/Unity3D

Conflicts:
	GoToSchool/GoToSchool.userprefs