some style edit info updates
Merge branch 'master' of github.com:benvandelay/default

Conflicts:
	app/themes/admin3/views/admin/page/_meta_form.php