a
Merge branch 'master' of https://github.com/blitzkriegg/AllianceResourceSummary

Conflicts:
	AllianceResourceSummary/web/index.jsp