Merge with trunk version

git-svn-id: https://plugins.svn.wordpress.org/redi-restaurant-reservation/branches/TwoStepReservation@1031669 b8457f37-d9ea-0310-8a92-e5e31aec5664