delete java directory
delete useless directories
Merge branch 'previous'
Merge branch 'master' of https://github.com/maplain/gypsy