Merge branch 'development' into i18n
devise users user en
Merge pull request #25 from jameszhan/i18n

I18n
Merge branch 'development'