updated for phase 2 rails upgrage
Merge branch 'rails-4-upgrade' of github.com:piplzchoice/cx-iq into rails-4-upgrade