Merge branch 'master', remote-tracking branch 'origin/master'
added ant target and removed tests
Merge branch 'master', remote-tracking branch 'origin/master'
Fixed bugs
deleted some filthy files