remove eclipse project file
project description
ignore .idea
Merge remote-tracking branch 'openshift/master'

Conflicts:
	README.md