rails upgrade gem changes
pin bootstrap-sass to 2.3
Do not allow admins and teachers without email addresses
remove debugging prints from test
rails upgrade gem changes
pin bootstrap-sass to 2.3
Merge branch 'finished' of github.com:code-dot-org/dashboard into rails-upgrade
clean up gemfile a bit more (remove capistrano and figaro)
change the hardcoded custom maze to a method instead of constant so we're not calling a class's methods before it's loaded
Merge branch 'finished' of github.com:code-dot-org/dashboard into rails-upgrade
resolve conflicts
Merge pull request #395 from code-dot-org/rails-upgrade

rails upgrade gem changes
Merge pull request #405 from code-dot-org/no-admins-or-teachers-without-email

No admins or teachers without email
Merge branch 'finished' into delivered