update .gitignore to add .settings/ folders
Merge remote-tracking branch 'origin' into feature/6.0/TUP-1566_Update_Eclipse_framework_to_Luna
Merge branch 'feature/6.0/TUP-1566_Update_Eclipse_framework_to_Luna'