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

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

Conflicts:
	properties
Add to make command line variables the editor cursor location
Allow editable combo boxes in make arguments GUI
Update components at startup
Update sample Makefile
Update keyboard shortcuts
Update properties
Ignore ctags index files
Update plugins
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