Merge pull request #106 from pamval/5-trunk

[BISERVER-10656]: CDE dashboards were not rendering due to Dojo 1.9 chan...
[BISERVER-10656] Fix for JQuery not being exported from AMD module when built with RequireJS Compressor
Merge pull request #107 from pentaho-nbaker/5-trunk

[BISERVER-10656] Fix for JQuery not being exported from AMD module when ...
[PRD-5005] - Added check to prevent double escape of already escaped strings
Merge pull request #109 from diogofscmariano/PRD-5005

[PRD-5005] - Added check to prevent double escape of already escaped str...
[BISERVER-10656] Subfloor-JS cleanup
Merge pull request #111 from pentaho-nbaker/5-trunk

[BISERVER-10656] Subfloor-JS cleanup
[CDF-257] - Timeplot was being loaded from external location instead of local copy
Merge branch '5-trunk' of github.com:webdetails/cdf into 5-trunk