Merge pull request #1 from qatang/master

合并更新
css
Revert "css"

This reverts commit a63b4ba1a0c61578de99d6429a0b3119ef18fe79.
Merge pull request #1 from qatang/master

同步
上传
Merge pull request #2 from qatang/dev

Dev
Merge pull request #3 from qatang/dev

更新
角色
角色
test
test
Merge pull request #2 from qatang/master

merge dev
init
Merge pull request #3 from qatang/dev

pull request
完善用户的增删改查
Merge pull request #4 from qatang/dev

更新20140701
init
角色更新
完善用户的增删改查
Merge pull request #3 from qatang/dev

merge