commit
Merge pull request #13 from CacheCake/master

merge
3.22.1
Merge branch 'master' of https://github.com/panningwjr/Lolit into panningwjr-master

Conflicts:
	WebRoot/WEB-INF/web.xml