Merge branch 'bug/gridgallery' into release/1.3
update custom meta boxes to 1.2

includes fixes for ssl in wp-admin
ixnay select 2 added by updating cmb
1.2.1
Merge branch 'release/1.2.1'
Merge branch 'master' into dev

Conflicts:
	admin/includes/custom-meta-boxes/classes.fields.php
fix failed merge back to dev