Updates.
Merge branch 'master' of https://github.com/juliusmasigan/SkillQuest

Conflicts:
	app/controllers/UserController.php