add .project back for eclipse
Merge branch 'eclipsefix'

Conflicts:
	.project