template removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	params.json
template removed