Merged with guillemot_dev

Tagged TouchXML as TouchXML_1.0.8_Release for release

label changes made by andrew

--HG--
branch : puffin-dev

Tagged TouchXML as TouchXML_1.0.7_Release for release

Tagged TouchJSON as TouchJSON_1.0.7_Release for release

Merged with default

--HG--
branch : metrics_dev

Fixed cachedObjects bug

Merged with smallsociety

Merged with smallsociety

Tagged TouchJSON as TouchJSON_1.0.6_Release for release