Started working on an embedded tomcat sample app for comparison - status=not working
Merge remote-tracking branch 'origin/master'