Merge pull request #86 from jjliang/umass_branch

Umass branch
fixed devise controller override
Merge pull request #87 from jjliang/staging

Staging