confirmations done
Merge branch 'feature/new-admin-ui' of github.com:Ortus-Solutions/ContentBox into feature/new-admin-ui
Merge branch 'feature/new-admin-ui' of github.com:Ortus-Solutions/ContentBox into feature/new-admin-ui

Conflicts:
	modules/contentbox-admin/includes/css/contentbox.css