agasga
Merge branch 'master' of ssh://github.com/boebu/ch.bfh.bti7081.s2013.yellow

Conflicts:
	ch.bfh.bti7081.s2013.yellow/src/main/java/ch/bfh/bti7081/s2013/yellow/service/medication/PrescriptionServiceImpl.java

merged