RS service call on  get languages and add language
exposing services for MealService as web service
Merge branch 'emil/for-master'

Conflicts:
	kcalculator/kcalculator-rs/src/main/java/com/kcalculator/ejb/MealServiceImpl.java
compile fehler on deleteMeal fixed
Merge branch 'emil/for-master'
Restructuring web pages, preparing to add fooditem management
initial version of food item management page
draft of landing page
Merge branch 'master' of https://github.com/arweed/kcalculator.git

Conflicts:
	kcalculator/kcalculator-ui-angularjs/src/main/webapp/index.html
call to add fooditem; get still not working
labels
styling
updated settings
renamed jdbc resources in order to use the resource auto creation
feature of glassfish - jdbc resources are now created on deployment
renamed jdbc properties according to postgresql documentation, fixed
jdbc jndi name
Merge remote-tracking branch 'origin/master' into emil/for-master