index
Merge branch 'master' of https://github.com/renekeijzer/ns

Conflicts:
	application/controllers/IndexController.php
	application/controllers/UserController.php