design fixes
Merge branch 'master' into ub

Conflicts:
	UniZensusAdminPlugin.class.php