Updated Diary
Updated scrum document and did some cleaning up
Merge branch 'master' into Sprint2/Item2.3/MedicalService

Conflicts:
	Project Pink/src/main/webapp/VAADIN/widgetsets/ch.bfh.bti7081.s2013.pink.AppWidgetSet/ch.bfh.bti7081.s2013.pink.AppWidgetSet.devmode.js
	Project Pink/src/main/webapp/VAADIN/widgetsets/ch.bfh.bti7081.s2013.pink.AppWidgetSet/ch.bfh.bti7081.s2013.pink.AppWidgetSet.nocache.js
	Project Pink/src/main/webapp/VAADIN/widgetsets/ch.bfh.bti7081.s2013.pink.AppWidgetSet/compilation-mappings.txt