clean warnings
remove old stuff
clean warnings
fix messed up build.properties
clean warnings
Merge branch 'master' into Navajo_issue_145