fileupload test
to heroku
Merge branch 'master' of https://github.com/Maaartin/SportAnalyze

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