Local commit.
Merge branch 'master' of github.com:mdinstuhl/marksmenus-java

Conflicts:
	MarksMenusClient/bin/com/marksmenus/controller/APIMap.class
	MarksMenusClient/bin/com/marksmenus/controller/MarksMenus.class
	MarksMenusClient/bin/com/marksmenus/domain/Menu.class
	MarksMenusClient/bin/com/marksmenus/domain/MenuItem.class
	MarksMenusClient/bin/com/marksmenus/handlers/RestaurantHandler.class
Extended some objects and did some DRY work.