added class Task
Merge branch 'menzs2'
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git
Improvement in class Task
Improvement in class Task
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
Merge branch 'master' into menzs2

Conflicts:
	TeamCyan/src/main/java/ch/bfh/bti7081/s2013/cyan/domain/entity/Task.java
Improvement in class Task
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
added TaskGenerator
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git