Awesome changeTemplate
Merge branch 'master' of github.com:dmerckx/cpl

Conflicts:
	src/handling/Handler.scala