corrected db url in persistence.xml file
merged files
Merge branch 'master' of https://github.com/arweed/kcalories

Conflicts:
	kcalculator/kcalculator-ejb/.gitignore
	kcalculator/kcalculator-ejb/src/main/resources/META-INF/persistence.xml
	kcalculator/kcalculator-ejb/src/test/java/com/kcalculator/ejb/LanguageQueryTest.java