fixed db migration
Merge remote branch 'origin/master' into production
fixed rake problems