db3.sql, faili valideerimine
Merge branch 'master' of https://github.com/Maaartin/SportAnalyze

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.velts/myapp/pom.xml