use cases task 4.
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink

Conflicts:
	Project Pink/doc/diary.html
correcting order of diary entries.