commit
ok
Merge branch 'master' of github.com:neonankiti/Shotoku

Conflicts:
	application/views/layout/user_header_view.php
ok
Merge branch 'master' of github.com:neonankiti/Shotoku

Conflicts:
	css/user/base.css