Merge branch 'upgrade_gems'
Revert "Merge branch 'upgrade_gems'"

This reverts commit 0fad69b383bff0898f99de7b29ced4216e365bc1, reversing
changes made to ce4393e07e081eb2609b36a6b560c5b65c939cfa.
Upgrade rails and fix password edit page.
Asset config changes in rails 4.1.6
Merge branch 'dev'