Bug fixes
Removed Amateur user type
Merge remote-tracking branch 'origin/master' into Jay

Conflicts:
	CZAOS/CZAOSWeb/admin/behavior/default.aspx