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

Conflicts:
	application/views/layout/user_main_view.php