added missing profile template file back (sorry paolo)
Merge remote-tracking branch 'upstream/master' into dev