Comitting to merge

Using commit to pull down ner version.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Assets/Game.unity