no message
Merge branch 'master' of https://github.com/Maaartin/SportAnalyze

Conflicts:
	src/main/webapp/WEB-INF/views/upload.jsp