updated gitignore with eclipse project files
Merge branch 'develop' into composition-tracker