Added password encrypting... finally.
Merge branch 'master' into misc

Conflicts:
	public_html/application/helpers/misc_helper.php
Merge pull request #13 from robertbrockie/misc

Added password encrypting... finally.