Merge pull request #108 from afrjorge/CDF-255

[CDF-255] cherry-pick from master & 5-trunk into core-refactor
Merge pull request #113 from afrjorge/CDF-255

[CDF-255] cherry-pick from master & 5-trunk into core-refactor
[CDF-257] - Timeplot was being loaded from external location instead of local copy

Conflicts:
	cdf-core/cdf/js/simile/timeplot/timeplot-api.js
Merge pull request #116 from pamval/core-refactor

[CDF-257] - Timeplot was being loaded from external location instead of ...