Merge remote-tracking branch 'origin/master' into LevelImporter

Conflicts:
	Shurikenjutsu/Shurikenjutsu/ObjectManager.h
	Shurikenjutsu/Shurikenjutsu/PlayingStateTest.cpp
	Shurikenjutsu/Shurikenjutsu/System.cpp