v 0.6.8
Merge branch 'master' of https://github.com/2UP/YC

Conflicts:
	system/application/models/users_model.php