Removed .htm suffix
Merge branch 'master' of https://github.com/Katharsas/GMM

Conflicts:
	src/main/java/gmm/web/AdminController.java
	src/main/java/gmm/web/TaskController.java
	src/main/webapp/WEB-INF/jsp/jqueryFileTree.jsp
	src/main/webapp/WEB-INF/tags/tasks_lists.tag