Update jars
Update properties
Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro

Conflicts:
	properties
Include editor make command line variable in amoMakeArgList function
Update properties
Update plugins
Update ubbrevs
Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro

Conflicts:
	amo-scripts/make.bsh
	properties
Fix access to null pointer
Save make arguments selected by the user to local properties file
Ensure console is visible when logging
Merge remote-tracking branch 'github/mac-book-pro' into trophy-mard0118
Simplify properties files
Improve editor/make interaction