header change
Merge branch 'master' of github.com:neonankiti/Shotoku

Conflicts:
	javascript/user/share.js