refactoring extracted data abstraction for classes.
Merge branch 'master' of https://github.com/sancarbar/rascal-android

Conflicts:
	HtmlScraper/src/Main.rsc
	HtmlScraper/src/Template.rsc