merging 2 branches - work in progress

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