fixed flag file
fixed flag file
Fix: warning regarding encoding in surefire-report
Fix: Warning regarding web.xml in maven-war-plugin
Merge remote-tracking branch 'origin/mjuliano' into integration