fix css
add navbar link
Merge branch 'master' of https://github.com/studiokami/wbdps

Conflicts:
	application/views/gp/sidebar.php