Modified poms to allow only the android project to be in the workspace
added .classpath, .project files
merge conflicts
fixed merge conflicts