fixed compilation errors, removed unused classes, added property file update code
Merge remote-tracking branch 'upstream/master'