jkane
Merge remote-tracking branch 'origin/jkane'

Conflicts:
	WoundManagement/.gitignore
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/BodyWoundSelector/WoundManager.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/BodyWoundSelector/WoundPosition.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/BodyWoundSelector/WoundSelector.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/ChangePasswordView.java
	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/LoginView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/PatientView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/PictureView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/StartMenuView.java
	WoundManagement/src/main/java/com/fau/amos/team2/WoundManagement/model/Employee.java
	WoundManagement/src/main/resources/META-INF/persistence.xml
	WoundManagement/src/main/webapp/VAADIN/widgetsets/com.fau.amos.team2.WoundManagement.gwt.AppWidgetSet/com.fau.amos.team2.WoundManagement.gwt.AppWidgetSet.nocache.js
	WoundManagement/src/main/webapp/VAADIN/widgetsets/com.fau.amos.team2.WoundManagement.gwt.AppWidgetSet/compilation-mappings.txt
	WoundManagement/src/main/webapp/VAADIN/widgetsets/com.fau.amos.team2.WoundManagement.gwt.AppWidgetSet/gecko1_8.manifest
	WoundManagement/src/main/webapp/VAADIN/widgetsets/com.fau.amos.team2.WoundManagement.gwt.AppWidgetSet/ie10.manifest
	WoundManagement/src/main/webapp/VAADIN/widgetsets/com.fau.amos.team2.WoundManagement.gwt.AppWidgetSet/safari.manifest
	WoundManagement/src/main/webapp/orbsel.png