spring security
add DataTable plugin
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa
merge
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa
Merge branches 'master' and 'rose_branch' of https://github.com/sigl-mepa-2015/mepa into rose_branch

Conflicts:
	mepa-front/src/main/webapp/WEB-INF/views/reporting/tournamentReporting.jsp