Katana render

the katana is on screen ; )
Merge remote-tracking branch 'origin/master'

Conflicts:
	XandarrRebellionFramework/GameplayState.cpp
	XandarrRebellionFramework/GameplayState.h
	XandarrRebellionFramework/Player.cpp
	XandarrRebellionFramework/Player.h
Merge branch 'master' of https://github.com/Tenshi-sama/XandarrRebellion