chat and friend module
Merge branch 'master' of github.com:Bitbytez/pan-football

Conflicts:
	application/models/User.php
	application/modules/frontend/controllers/UserController.php
	public/frontend/stylesheets/dev.css