Ignoring .DS_Store
Updating .project
Because Eclipse
Merge branch 'development' into feature/er-restapi