Fixing bug in shift template edit operation
Merge remote branch 'origin/release' into qa

Conflicts:
	api/business/voip_manager.class.php