Fixed assets.
Updated user_index
Merge branch 'master' of https://github.com/phyizal/JavaLife2

Conflicts:
	application/views/user_index.php