Merge branch 'master' into better-args-parsing

Conflicts:
	classes.fields.php
Alignment
Filterable args
Customisable Gmap fields
Fix saving of fields
Remove AJAX URL arg
Fix arg used as description
Merge branch 'better-args-parsing' into dev

Conflicts:
	class.cmb-meta-box.php
	classes.fields.php