Fix Bugs

Enchance Front Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/user.php