fix devise confirmation token bug
Merge branch 'release' of github.com:fairnopoly/fairnopoly into import
Add encding check to mass-upload