Merge remote-tracking branch 'github/trophy-mard0118' into mac-book-pro

Conflicts:
	amo-scripts/Makefile.bsh
	amo-scripts/make.bsh
	amo-scripts/make/gui.bsh
	amo-scripts/make/listener.bsh
	macros/make/make_all.bsh
	macros/make/make_clean.bsh
	macros/make/make_clean_all.bsh
	macros/make/make_compile.bsh
	macros/make/make_configure.bsh
	macros/make/make_doc.bsh
	macros/make/make_exec.bsh
	macros/make/make_init.bsh
	macros/make/make_sync.bsh
	properties
Remove files
Update properties