update
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/config/routes.php
	application/modules/register/controllers/register.php