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

Conflicts:
	src/main/java/com/velts/myapp/controller/FileUploadController.java
	src/main/webapp/WEB-INF/views/upload.jsp
nimevälja validator