2234 commit
Merge branch 'master' of https://github.com/devilhuang123/firefoxproject

Conflicts:
	js/task.js
0315 task style add
Merge remote branch 'origin/task0104-2'
after merge task0104-2