Pre-commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	azuki-base/.classpath
	azuki-base/.settings/org.eclipse.jdt.core.prefs