Merge pull request #11 from HollyDAI/master

merge
Merge pull request #17 from HollyDAI/master

pull
201405111906
20140511
Merge pull request #18 from HollyDAI/holly

Holly
Merge remote-tracking branch 'origin/master' into xr

Conflicts:
	WebRoot/WEB-INF/web.xml