Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/user.php
Added user and user's comment management