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

Conflicts:
	application/views/layout/user_header_view.php
	javascript/user/share.js