Testing commit
Merge branch 'master' into staging
Merge remote-tracking branch 'origin/staging' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Trying to fix db migration problem in appharbor
Trying to fix db migration problem in appharbor
Trying to fix db migration problem in appharbor
Merge branch 'staging'