.
Merge branch 'master' of https://github.com/salesnya/kodok_sales2

Conflicts:
	application/controllers/auth.php