Updated the WoundApp project. The prior merging lead to several errors at compile time
Updated Storyboard with Class Names, renamed all Views
added more precise feedback for NewWoundView (feel free to check)
added checks for WoundType restrictions
checks for input length, improved formatting
fixed LoggedInView call of constructor for a NewWoundView
Deleted 'target'-folder from Phonegap App
added first version of dictionary
added dictionary to WoundSelector/WoundManager
Merge branch 'develop' of https://github.com/fau-amos-2014-team-2/root into develop
online db connection. password needs to be provided in WoundManagement/config.pwd. Changec class hierarchie. see var/UML.pdf.
moved MessageBundle[..].properties to resources/bundles, before, they'd been ignored by maven
Merge branch 'develop' of https://github.com/fau-amos-2014-team-2/root into develop

Conflicts:
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/LoggedInView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/LoginUI.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/NewWoundView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/StartMenuView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/UserLoginView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/UserPasswordView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/WardSelectionView.java
Merge branch 'develop' of https://github.com/fau-amos-2014-team-2/root into develop

Conflicts:
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/LoginUI.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/UserLoginView.java
Refactoring

Removed bin folder
Added config.pwd to gitignore
Renamed model package
Changed MessageResources to class
Changed EmployeeProvider to non-generic class
Changed ddl-generation from drop-and-create-tables to
create-or-extend-tables
Removed automatic data generation
Added button for data generation
Merge branch 'feature_refactoring' into develop
Added UserBar

Organized imports
Employee: Changed Getter for currentWard and workingWard to correct
return type
WardProvider: Changed to non-generic class, added getAll-method
UserPasswordView: Changed to popover
LoginUI: Renamed to WoundManagementUI, added check for already active
session
Added UserBar
Merge branch 'feature_header' into develop
PinGrid is now working correctly
Extracted NumericButtonField