removed eclipse generated files
Merge branch 'working' into fixes