.
Merge branch 'master' of https://github.com/jeswinjames24/projectn

Conflicts:
	app/controllers/UsersController.php
Merge branch 'master' of https://github.com/jeswinjames24/projectn
.