fix the application for maven build
Merge branch 'fares'