update mm for  custom_tv:type
up to d6.15
Merge branch 'master' into develop

* master:
  up to d6.15
  update mm for  custom_tv:type

Conflicts:
	manager/includes/version.inc.php
Merge branch 'develop' into clear

* develop:
  up to d6.15
  update mm for  custom_tv:type

Conflicts:
	assets/plugins/managermanager/mm.inc.php