Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro
Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro
Remove projectviewer properties from repository
Update properties
Update plugins
Update macros
Update keys
Improve make scripts
Update properties
Improve make scripts
Add customizations
Update properties
Update make scripts
Update macros
Update jars
Update properties
Update .gitignore file
Merge remote-tracking branch 'github/mac-book-pro' into trophy-mard0118

Conflicts:
	.gitignore
	amo-scripts/make/listener.bsh
	macros/make/make_clean_all.bsh
	plugins/projectviewer.ProjectPlugin/config.properties
	properties
Add customization macros
Add make macros