Removed Eclipse project files
Merge branch 'master' into develop

Conflicts:
	.classpath
	.gitignore
	.project