String templates extended
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/alia/AliaCodeGeneratorStringTemplate.java
Fixed merge fail