heroku db add_user
Merge branch 'master' of heroku.com:sport-analyze into heroku_db_add_user

Conflicts:
	src/main/java/com/velts/myapp/scribe/FacebookScribeAuthenticator.java
Vajalik
Merge remote-tracking branch 'origin/heroku_db_add_user'