Pre-pull commit.

Signed-off-by: Michael Schmidt <mikey.schmidt@hotmail.com>
Merge remote-tracking branch 'janus/dev' into dev
Merge branch 'dev' of http://github.com/ForseenEnding/Janus.git into dev
Updated GameObject.

Signed-off-by: Michael Schmidt <mikey.schmidt@hotmail.com>