Control Panel: added gritter notifications
Merge remote-tracking branch 'origin/1.2.0a' into 1.2.0a

Conflicts:
	public_html/admin/view/default/javascript/general.js
	public_html/admin/view/default/template/pages/catalog/product_options.tpl
	public_html/admin/view/default/template/responses/product/option_values.tpl