Migrating to rails4
Merge branch 'master' into rails4