Conflicts:
	languages/cleanbook-fr_FR.mo
Merged edit_appointment with conflicts

git-svn-id: https://plugins.svn.wordpress.org/cleanbook/trunk@1018564 b8457f37-d9ea-0310-8a92-e5e31aec5664