post ad
Merge branch 'master' of https://github.com/coolmach/coolapp

Conflicts:
	resources/struts.xml