First commit. I was able to merge the two webapps' wars into a single war.