edit adik.4

merubah tampilan dikit - dikit.
Merge branch 'master' of https://github.com/NurHardy/web_if

Conflicts:
	application/views/skin/sidebar.php
	assets/css/global.css
	assets/css/tablet_version.css
	assets/menu.php