Merge pull request #40 from HollyDAI/master

holly
20140513 23：16
Merge branch 'holly' of https://github.com/HollyDAI/seweb.git into holly
Merge pull request #41 from HollyDAI/holly

Holly