config for integration Tomcat server

+ upgrades to AspectJ, Tiles
Merge remote-tracking branch 'origin/master'