Merge test
Merge branch 'master' of
https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git

Conflicts:
	TeamCyan/doc/0_diary_cyan.txt