Merge pull request #1 from akofink/e1461

Fix the database setup, migrate and seeds
Fix the student_teams_controller test
Merge pull request #2 from akofink/e1461

Fix the student_teams_controller test
Merge remote-tracking branch 'e1461/rails4' into rails4