[CDF-205] - CDF core-refactor
	- Fixed bug when setting template style via URL parameter 'template' in version 5
Merge pull request #137 from afrjorge/core-refactor

[CDF-205] - CDF core-refactor