Rapidminer templated
Merge branch 'rapid2' into dev