Added Show password and took password character requirements off
Merge branch 'Show-password-function'

Conflicts:
	app/assets/javascripts/application.js