Merge pull request #1 from qatang/master

test
Merge pull request #1 from qatang/master

合并更新
css
Revert "css"

This reverts commit a63b4ba1a0c61578de99d6429a0b3119ef18fe79.
Merge pull request #2 from qatang/dev

Dev
Merge pull request #3 from qatang/dev

更新
Merge pull request #4 from qatang/dev

更新20140701
Merge pull request #38 from hewang/master

hewang_更新20140714
Merge pull request #41 from chirowong/master

merge
Revert "merge"
Merge pull request #42 from qatang/revert-41-master

Revert "merge"
Merge pull request #7 from qatang/dev

merge dev