Removed Database Connection Prompt
Merge branch 'develop' of https://github.com/fau-amos-2014-team-2/root into develop
Tomcat Intermediate State
JNDI Connection
Added Path Settings to Phonegap iOS Implementation
Merge branch 'tomcat' into develop
improved marking of wounds when healed
Tomcat deployable WAR
Merge branch 'develop' of https://github.com/fau-amos-2014-team-2/root into develop
Merge branch 'healingWounds' into develop
switching the language is possible
wound selection and shown wound data is consistent
language initially set to language of browser
woundLevels are filtered according to woundType, in CreateWoundDescriptionView woundLevel and woundType initially set to woundLevel and woundType of respective wound
Phonegap Android Project
Added Settings View to Phonegap-Android
Localized Phonegap-Android
Cleaned up Phonegap
Merge branch 'phonegap-android' into develop
Updated Layout