Merge branch 'develop'
Merge pull request #2 from vizzito/develop

merge
properties file for input tomcat folder location