Merged latest from lloydw/libRocket and fixed conflicts and bugs

* Merged c95b8f4a1895340e1b847cba2d29a529601bb151 from upstream (lloydw/libRocket)
* Fixed conflicts in CMake scripts
* Fixed a problem in luainvaders caused by changes from upstream