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

Conflicts:
	TeamCyan/src/main/java/ch/bfh/bti7081/s2013/cyan/domain/entity/Task.java