Update properties
Add amo-make script
Update shortcuts
Update plugins
Add c++ abbrevs
Update FastOpen plugin
Update deckable windows positions
Update properties
Sort properties file
Merge branch 'mac-book-pro'

Conflicts:
	DockableWindowManager/perspective-view0.xml
	keymaps/jEdit_keys.props
	properties
Update macros
Update make macros
Update properties