* UTF-8 bug
Merge branch 'master' of github.com:Lightpower/nfr

Conflicts:
	app/mailers/user_mailer.rb