added some details in session window
Merge branch 'master' of local repository into task11-2.7
continued session overview
Merge remote-tracking branch 'origin/master' into task11-2.7

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/model/Session.java
Merge remote-tracking branch 'origin/master' into task11-2.7
- Don't show the indicator if there is no element
- removed notes from patient detail view, they have their own
Merge remote-tracking branch 'origin/Sprint2/MedicalPrescriptionGui'
into Sprint3/task11-0.5

Conflicts:
	Project
Pink/src/main/java/ch/bfh/bti7081/s2013/pink/MedicalPrescriptionView.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/SessionWindow.java
	Project
Pink/src/main/java/ch/bfh/bti7081/s2013/pink/medication/LocalMedicalService.java
Added Start & End Date to Prescription. Allowing Setting Reason for not unsafe Prescriptions.
Fixed Touch Library Version, as it kills my pc otherwise :(
Merge branch 'Sprint2/MedicalPrescriptionGui' into Sprint3/MedicalServiceTests

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/medication/IMedicalService.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/model/MedicationPrescription.java
Merge remote-tracking branch 'origin/master' into Sprint3/task11-0.5
Added Mock Patient Data Source, Fixed Tests, Fixed Code Error.
Merge remote-tracking branch 'origin/Sprint2/MedicalPrescriptionGui' into Sprint3/MedicalServiceTests

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/view/SessionOverView.java
added From & To Date.
Delete them damn notes!
started with session note managment
Merge branch 'Sprint3/MedicalServiceTests'
Merge remote-tracking branch 'origin/Sprint2/MedicalPrescriptionGui'
Forgot to add this image...
Merge remote-tracking branch 'origin/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/medication/LocalMedicalService.java
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/view/SessionOverView.java