merge with develop branch
updated .gitignore
clean .classpath