[B#1204] updated logic to display correctly
B#1223 removed old new category modal, updated to allow quick add keystroke/link to go directly to new category page
Merge remote-tracking branch 'remotes/origin/D972' into develop

Conflicts:
	catalog/admin/templates/default/general.js.php