toppage
Merge ranch 'master' of github.com:neonankiti/Shotoku

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