Fixed: Malformed href attribute in ticket_system.tpl (admin/reseller levels)
Merge branch '1.1.x' into stable

Conflicts:
	CHANGELOG