Updated files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hooks.xm
	Makefile
	Settings.mm