gitignore eclipse metadata
Merge branch 'master' into MiK

Conflicts:
	.gitignore