adding .settings/
fixing project.properties
Merge branch 'newbb'