more medications
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
Changes in DBUSer, Patien and Medication
Further improvements
Changes in Task and Import.sql