Moved webapp into main to remove complaint
from maven about webxml.
Merge branch 'enable-system-tests' into staging