Merge remote-tracking branch 'origin/McKee'

Conflicts:
	Maven.userprefs
Merge branch 'master' of https://github.com/Shadowh4wk/Maven

Conflicts:
	Maven.userprefs