heapdump
Merge branch 'master' of https://github.com/barrysfinalhome/shadowsocks-chromeapp

Conflicts:
	manifest.json