Updates
Merge branch 'master' of http://github.com/goandget/goQuizBase

Conflicts:
	system/application/controllers/user.php