auto-ignore eclipse project metadata
Merge branch 'master' into junit

Conflicts:
	.gitignore