added .metadata and .class to gitignore
Merge branch 'master' into develop