Updates for Eclipse use.
Merge remote-tracking branch 'origin/development0.04' into
multi_threading

Conflicts:
	.gitignore