Committing to prevent pull conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs