added MainUI
Merge remote-tracking branch 'origin/master' into origin_master

Conflicts:
	ch.bfh.bti7081.s2013.yellow/src/main/java/ch/bfh/bti7081/s2013/yellow/ui/medication/PrescriptionUI.java
Merge remote-tracking branch 'origin/master' into origin_master

Conflicts:
	ch.bfh.bti7081.s2013.yellow/src/main/java/ch/bfh/bti7081/s2013/yellow/model/notification/Notification.java