LAST COMMIT!?
Merge https://github.com/eriyaterada/pass_generator into js

Conflicts:
	app/controllers/encpasswords_controller.rb
	app/models/user.rb