adding java git stuff from eclipse
Merge branch 'master' of github.com:Floobits/floobits-intellij