ant file and some clean up
Merge branch 'master' of https://github.com/col726/PMSP