TODailyMealPLan and TOMealPLan implemented
Daily meal plan interface added. No Implementation available
meal plan interface. No implementation!
incomplete implementation and unittests. Converters not available.
Merge remote-tracking branch 'origin/master' into emil/for-master
merge with master
Merge remote-tracking branch 'origin/master' into emil/for-master
addDailyMealPlan implemented. Tests incomplete!
new tests
Merge remote-tracking branch 'origin/master' into emil/for-master

Conflicts:
	kcalculator/kcalculator-api/.classpath
	kcalculator/kcalculator-common/.classpath
	kcalculator/kcalculator-datageneration/.classpath
	kcalculator/kcalculator-devsettings/.classpath
	kcalculator/kcalculator-domain/.classpath
	kcalculator/kcalculator-ejb/.classpath
	kcalculator/kcalculator-rs/.classpath
move implementation from ejb to rs
DailyMealPlan Service completed. Cascading delete still not working
properly. teardown methode doesn't work!
Meal service improvements. Unit tests fix.
update of the daily meal service. No Meals on DailyMealPlan creation.
putMeal added. Improvements on the MealService and tests.
Cascading removed. Meals should not be deleted on dailymealplan delete.
remove meal added
javadoc for the new methodes
Merge branch 'emil/for-master'

Conflicts:
	kcalculator/kcalculator-rs/src/main/java/com/kcalculator/ejb/MealServiceImpl.java