Merge pull request #137 from afrjorge/core-refactor

[CDF-205] - CDF core-refactor
[CDF-205] - CDF core-refactor
	- removed deprecated resources-*.txt resource files, changed build.xml accordingly
	- added resources.bootstrap.properties to include bootstrap related files
Merge pull request #138 from afrjorge/core-refactor

[CDF-205] - CDF core-refactor