Batch edit added
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/pages/element.php
	admin/pages/field_form.php
	admin/pages/type.php