#1

- did some good shit ;-)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/clispRules/templates.bat