Tj's first commit message.
Merge branch 'TJSceneDev' into dev