Uploadimisel check, kas on CSV fail.
Merge branch 'master' of heroku.com:sport-analyze
Merge remote-tracking branch 'origin/master'
pomi muudatused mida ma pole teinud (?)
Admini check(kas permission="2")
Merge branch 'master' of heroku.com:sport-analyze into heroku_db_add_user

Conflicts:
	src/main/java/com/velts/myapp/scribe/FacebookScribeAuthenticator.java