new password encryption method!
Merge branch 'development' of https://github.com/dducro/epicblog into development

Conflicts:
	application/controllers/user.php
	application/models/user_model.php