IntelliJ IDEA 14.0.1 <dale@retina-pro Update other.xml
IntelliJ IDEA 14.0.1 <dale@retina-pro Update find.xml
IntelliJ IDEA 14.0.2 <dale@retina-pro Update other.xml, project.default.xml, packages.xml	Delete PHP.xml, reStructuredText.xml, Octopress.xml, PythonFoo.xml, SQL.xml, Ruby.xml, XHTML.xml, CSS.xml, CodeIgniter.xml, WhaleShark v1.2.xml, Zen XSL.xml, Ruby_Rails.xml, Linux.icls, Python.xml, vibrantInk.icls, Dale OSS.xml, Tornado.xml, Hero Lab.xml, QUnit.xml, Rails.xml, output.xml, Google Go.xml, PHPUnit.xml, Django.xml, Deployment.xml, Java.xml, JavaScript.xml, Python Tools.xml, JSON.xml, ZenBurn.icls, Dark Pastels.icls, surround.xml, Zen CSS.xml, Solarized Light.icls, ssp.xml, Python _ PyJobs.xml, Text.xml, Mac OS X _Dale_.xml, html_xml.xml, Oleg 2_Space.xml, Java.xml, DCA.xml, jQuery.xml, Default.xml, JavaScript Tools.xml, Python _ Snippets.xml, Solarized Dark.icls, WordPress.xml, Eclipse Phase.xml, Objective_C copy.xml, scala.xml, Web Services.xml, PHP _ Logging.xml, Python _ Logging.xml, Dale.xml, colbalt.icls, GSP.xml, Dark Pastels Retina.icls, Dart.xml, Dale Vim.xml, Zen HTML.xml, Python - PyCharm.xml, Simply Hired.xml, PHP _ RMN Logging.xml, Python _ Testing.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/find.xml
	$APP_CONFIG$/packages.xml
IntelliJ IDEA 14.0.2 <dale@retina-pro Update other.xml, filetypes.xml, ide.general.xml	Create PHP.xml, reStructuredText.xml, Octopress.xml, PythonFoo.xml, SQL.xml, Ruby.xml, XHTML.xml, CSS.xml, CodeIgniter.xml, WhaleShark v1.2.xml, Zen XSL.xml, Ruby_Rails.xml, Linux.icls, Python.xml, vibrantInk.icls, Dale OSS.xml, Tornado.xml, Hero Lab.xml, QUnit.xml, Rails.xml, output.xml, Google Go.xml, PHPUnit.xml, Django.xml, Deployment.xml, Java.xml, JavaScript.xml, Python Tools.xml, JSON.xml, ZenBurn.icls, Dark Pastels.icls, surround.xml, Zen CSS.xml, Solarized Light.icls, ssp.xml, Python _ PyJobs.xml, Text.xml, Mac OS X _Dale_.xml, html_xml.xml, Oleg 2_Space.xml, Java.xml, DCA.xml, jQuery.xml, Default.xml, JavaScript Tools.xml, Python _ Snippets.xml, Solarized Dark.icls, WordPress.xml, Eclipse Phase.xml, Objective_C copy.xml, scala.xml, Web Services.xml, PHP _ Logging.xml, Python _ Logging.xml, Dale.xml, colbalt.icls, GSP.xml, Dark Pastels Retina.icls, Dart.xml, Dale Vim.xml, Zen HTML.xml, Python - PyCharm.xml, Simply Hired.xml, PHP _ RMN Logging.xml, Python _ Testing.xml
IntelliJ IDEA 14.0.2 <dale@retina-pro Update other.xml, project.default.xml
IntelliJ IDEA 14.0.2 <dale@retina-pro Delete PHP.xml, reStructuredText.xml, Octopress.xml, PythonFoo.xml, SQL.xml, Ruby.xml, XHTML.xml, CSS.xml, CodeIgniter.xml, WhaleShark v1.2.xml, Zen XSL.xml, Ruby_Rails.xml, Linux.icls, Python.xml, vibrantInk.icls, Dale OSS.xml, Tornado.xml, lua.xml, Hero Lab.xml, QUnit.xml, Rails.xml, output.xml, Google Go.xml, PHPUnit.xml, Django.xml, Deployment.xml, Java.xml, JavaScript.xml, Python Tools.xml, JSON.xml, ZenBurn.icls, Dark Pastels.icls, surround.xml, Zen CSS.xml, Solarized Light.icls, ssp.xml, Python _ PyJobs.xml, Text.xml, Mac OS X _Dale_.xml, html_xml.xml, Oleg 2_Space.xml, Java.xml, DCA.xml, jQuery.xml, Default.xml, JavaScript Tools.xml, Python _ Snippets.xml, Solarized Dark.icls, WordPress.xml, Eclipse Phase.xml, Objective_C copy.xml, scala.xml, Web Services.xml, PHP _ Logging.xml, Python _ Logging.xml, Dale.xml, colbalt.icls, GSP.xml, Dark Pastels Retina.icls, Dart.xml, Dale Vim.xml, Zen HTML.xml, Python - PyCharm.xml, Simply Hired.xml, PHP _ RMN Logging.xml, Python _ Testing.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$ROOT_CONFIG$/templates/CSS.xml
	$ROOT_CONFIG$/templates/CodeIgniter.xml
	$ROOT_CONFIG$/templates/DCA.xml
	$ROOT_CONFIG$/templates/Dart.xml
	$ROOT_CONFIG$/templates/Django.xml
	$ROOT_CONFIG$/templates/Eclipse Phase.xml
	$ROOT_CONFIG$/templates/Google Go.xml
	$ROOT_CONFIG$/templates/Hero Lab.xml
	$ROOT_CONFIG$/templates/JSON.xml
	$ROOT_CONFIG$/templates/Java.xml
	$ROOT_CONFIG$/templates/JavaScript.xml
	$ROOT_CONFIG$/templates/Objective_C copy.xml
	$ROOT_CONFIG$/templates/Octopress.xml
	$ROOT_CONFIG$/templates/PHP _ Logging.xml
	$ROOT_CONFIG$/templates/PHP _ RMN Logging.xml
	$ROOT_CONFIG$/templates/PHP.xml
	$ROOT_CONFIG$/templates/PHPUnit.xml
	$ROOT_CONFIG$/templates/Python - PyCharm.xml
	$ROOT_CONFIG$/templates/Python _ Logging.xml
	$ROOT_CONFIG$/templates/Python _ PyJobs.xml
	$ROOT_CONFIG$/templates/Python _ Snippets.xml
	$ROOT_CONFIG$/templates/Python _ Testing.xml
	$ROOT_CONFIG$/templates/Python.xml
	$ROOT_CONFIG$/templates/PythonFoo.xml
	$ROOT_CONFIG$/templates/QUnit.xml
	$ROOT_CONFIG$/templates/SQL.xml
	$ROOT_CONFIG$/templates/Text.xml
	$ROOT_CONFIG$/templates/Tornado.xml
	$ROOT_CONFIG$/templates/WordPress.xml
	$ROOT_CONFIG$/templates/XHTML.xml
	$ROOT_CONFIG$/templates/Zen CSS.xml
	$ROOT_CONFIG$/templates/html_xml.xml
	$ROOT_CONFIG$/templates/jQuery.xml
IntelliJ IDEA 14.0.2 <dale@retina-pro Update Zen CSS.xml, project.default.xml, PHP.xml, Octopress.xml, SQL.xml, PythonFoo.xml, Python _ PyJobs.xml, filetypes.xml, XHTML.xml, CSS.xml, Text.xml, CodeIgniter.xml, other.xml, html_xml.xml, Java.xml, DCA.xml, jQuery.xml, Python.xml, Python _ Snippets.xml, Tornado.xml, Hero Lab.xml, QUnit.xml, WordPress.xml, Google Go.xml, Eclipse Phase.xml, Objective_C copy.xml, PHPUnit.xml, Django.xml, JavaScript.xml, PHP _ Logging.xml, Python _ Logging.xml, JSON.xml, packages.xml, Dart.xml, Python - PyCharm.xml, Python _ Testing.xml, PHP _ RMN Logging.xml	Create surround.xml, reStructuredText.xml, Solarized Light.icls, ssp.xml, Ruby.xml, Mac OS X _Dale_.xml, WhaleShark v1.2.xml, Oleg 2_Space.xml, Zen XSL.xml, Linux.icls, Default.xml, Ruby_Rails.xml, JavaScript Tools.xml, vibrantInk.icls, Dale OSS.xml, lua.xml, Rails.xml, Solarized Dark.icls, output.xml, scala.xml, Web Services.xml, Java.xml, Deployment.xml, Python Tools.xml, colbalt.icls, Dale.xml, ZenBurn.icls, GSP.xml, Dark Pastels Retina.icls, Dark Pastels.icls, Dale Vim.xml, Zen HTML.xml, Simply Hired.xml