clarified labels for address and port in email settings, from user feedback - SYSMO-1654
added cancel links to the main admin pages - SYSMO-1654
update tags
Merge ../seek-git-tmp into seek-0.21

Conflicts:
	.hgtags