Merge pull request #4 from dimd13/dev

Dev
reg off
Merge branch 'master' into dev

Conflicts:
	application/config/auth.php