STR-315: merging changes in strc since r6609 and refactored
STR-315: merging changes in strc since r6609 and refactored

svn path=/trunk/StrategoXT/; revision=10243

Apanatshka/strategoxt,lichtemo/strategoxt,Apanatshka/strategoxt,Apanatshka/strategoxt,lichtemo/strategoxt,metaborg/strategoxt,Apanatshka/strategoxt,lichtemo/strategoxt,Apanatshka/strategoxt,lichtemo/strategoxt,metaborg/strategoxt,metaborg/strategoxt,lichtemo/strategoxt,metaborg/strategoxt,metaborg/strategoxt