reg off
exclude
Merge pull request #5 from dimd13/conf

exclude
Merge branch 'master' into dev

Conflicts:
	application/config/auth.php
Merge pull request #7 from dimd13/dev

exclude