Fix recurcive loop
Implement deleting team
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa

Conflicts:
	mepa-front/src/main/webapp/WEB-INF/views/tournament/read/view.jsp