changed structure but not adapted files to this changes
merge master
modified bin/omero_importer
modified .gitignore
merged structure branch
modified environment setting