misc
Merge branch 'mvd' of https://github.com/cafecentral/bonaparte into mvd

Conflicts:
	cafecentral/theme/form/default/field.edit.php