started change of comments
Merge branch 'master' of https://github.com/Katharsas/GMM

Conflicts:
	src/main/webapp/WEB-INF/tags/tasks_lists.tag