Merge remote-tracking branch 'origin/master'

Conflicts:
	TeamCyan/src/main/resources/import.sql
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan

Conflicts:
	TeamCyan/src/main/java/ch/bfh/bti7081/s2013/cyan/view/AppointmentDetailView.java