fix errors in subfolder installations
Merge pull request #165 from Pathologic/master

fix Store errors in subfolder installations
get rid of global $modx
http://modx.im/blog/questions/2663.html
fix quotes bug in site_name
better fix (:
Merge pull request #166 from Pathologic/master

get rid of global $modx
Merge pull request #167 from Pathologic/tree_qoutes_bug

Tree quotes bug
fix #166
Merge pull request #168 from Pathologic/master

fix #166
ukrainian
add change from modx evolution develop branch
Merge branch 'master' into develop

* master:
  add change from modx evolution develop branch

Conflicts:
	manager/actions/search.static.php
	manager/includes/extenders/dbapi.mysqli.class.inc.php
	manager/includes/lang/english.inc.php
	manager/includes/lang/russian-UTF8.inc.php
	manager/includes/version.inc.php
disabled search by template
fix typo
refactor  .DS_Store
update to 1.0.15-d6.18
Merge branch 'master' into develop

* master:
  update to 1.0.15-d6.18

Conflicts:
	manager/frames/nodes.php
	manager/includes/document.parser.class.inc.php
	manager/includes/version.inc.php
Merge branch 'develop' into clear

* develop:
  update to 1.0.15-d6.18
  refactor  .DS_Store
  fix typo
  disabled search by template
  add change from modx evolution develop branch
  ukrainian
  fix #166
  better fix (:
  fix quotes bug in site_name
  http://modx.im/blog/questions/2663.html
  get rid of global $modx
  fix errors in subfolder installations

Conflicts:
	assets/modules/docmanager/tv.ajax.php
	assets/plugins/tinymce/js/mce_init.js.inc
	assets/plugins/tinymce/lang/czech.inc.php
	assets/plugins/tinymce/lang/english.inc.php
	assets/plugins/tinymce/lang/finnish.inc.php
	assets/plugins/tinymce/lang/francais-utf8.inc.php
	assets/plugins/tinymce/lang/german.inc.php
	assets/plugins/tinymce/lang/italian.inc.php
	assets/plugins/tinymce/lang/japanese-utf8.inc.php
	assets/plugins/tinymce/lang/nederlands-utf8.inc.php
	assets/plugins/tinymce/lang/persian.inc.php
	assets/plugins/tinymce/lang/polish-utf8.inc.php
	assets/plugins/tinymce/lang/portuguese-br.inc.php
	assets/plugins/tinymce/lang/portuguese.inc.php
	assets/plugins/tinymce/lang/russian-UTF8.inc.php
	assets/plugins/tinymce/lang/spanish-utf8.inc.php
	assets/plugins/tinymce/lang/svenska-utf8.inc.php
	assets/snippets/eform/eform.inc.php
	install/setup.data.sql