Merged latest from lloydw/libRocket and fixed conflicts and bugs