ignore eclipse project files
Merge branch 'development'