Initial commit
创建目录
addfiles
no message
Merge branch 'master' of coding.net:integ/WeShoot

Conflicts:
	app/scripts/contentscript.js
message
Merge branch 'master' of coding.net:integ/WeShoot
no message
Merge branches 'master' and 'master' of coding.net:integ/WeShoot
message
no message
Merge branch 'master' of coding.net:integ/WeShoot

Conflicts:
	app/scripts/options.js
bugfix
Merge branch 'master' of coding.net:integ/WeShoot
bugfix
Merge branch 'master' of coding.net:integ/WeShoot
no message
bugfix
Merge branch 'master' of coding.net:integ/WeShoot
bug