ignore .settings (eclipse folder)
Merge branch 'master' into update_sdp_shared_version
Updating to sdp-shared 1.1