Updated formatting of the license file
Some configuration files for eclipse
Updated preferences to match parent project
Merge remote-tracking branch 'upstream/master'

Conflicts:
	LICENSE