Fixed issue 1 problems, edited .gitignore and build.xml