ok
ok
ok
6: Bug2 

Task-Url: http://github.com/DATTest/DATTestProject/issues/issue/6
Merge branch 'develop_tm'

Conflicts:
	DATProject2/src/main/java/com/dat/web/HomeController.java
commit
commit
Merge branch 'develop_tm'