Merge pull request #36 from HollyDAI/master

Merge pull request #35 from HollyDAI/holly
20140513
20140513 19：44
Merge branch 'holly' of https://github.com/HollyDAI/seweb.git into holly
Merge pull request #37 from HollyDAI/holly

Holly