Changes in Medicament
Changes in Medicament and Reminder
Changes in Medicament
Merge branch 'master' of
https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into
menzs2

Conflicts:
	TeamCyan/src/main/java/ch/bfh/bti7081/s2013/cyan/domain/entity/Medication.java
	TeamCyan/src/main/resources/import.sql
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
added Users