Merge branch 'master' into xinsong
get most of the twitter and google+ done
update from git pull
Merge branch 'xinsong'

Conflicts:
	manifest.json
	src/browser_action/browser_action.html
	src/twitter/tweet.html