Fixed the tinyxml cmake include issue
Updated a tinyxml path in Scene.cpp
Added/Merged all changes that have been added to the SVN repository