Added mac settings
Merge branch 'master' into mac

Conflicts:
	keymaps/imported_keys.props
	properties
Updated mac keys