tweaks to property file loading
updated run and compile-run scripts to work with maven
Merge branch 'master', remote-tracking branch 'origin/post-integration-feb26'
killed old method