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

Conflicts:
	cafecentral/theme/section/notes/notes.php