some changes by seiler
Merge remote-tracking branch 'origin/Sprint2/MedicalPrescriptionGui' into Sprint3/task11-0.5

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/SessionWindow.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/view/MedicalPrescriptionView.java