MOD: improve tempalte selector
Merge branch 'NRPUIV2' of https://github.com/capensis/canopsis into NRPUIV2

Conflicts:
	sources/webcore