Uplication updated
Merge branch 'master' of https://github.com/eyeway68/pocketsneo4j

Conflicts:
	application/controllers/auth.php