IntelliJ IDEA 14.0.2 <jason@Jasons-MBP Update other.xml, project.default.xml, notifications.xml, ide.general.xml, ui.lnf.xml
IntelliJ IDEA 14.0.2 <jason@Jasons-MBP Delete Default _1_.xml, Mac OS X copy.xml, Default.xml, MyKeyMap.xml, Darcula copy.icls
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/notifications.xml
	$APP_CONFIG$/project.default.xml
	$APP_CONFIG$/ui.lnf.xml
	$ROOT_CONFIG$/codestyles/Default _1_.xml
	$ROOT_CONFIG$/colors/Darcula copy.icls
	$ROOT_CONFIG$/inspection/Default.xml
IntelliJ IDEA 14.0.2 <jason@Jasons-MBP Update other.xml, packages.xml, filetypes.xml, ide.general.xml	Create notifications.xml	Delete Default _1_.xml, Default.xml, Darcula copy.icls