Merge pull request #230 from Haprog/tinymce-default-width

Update TinyMCE default width to 100% (issue #202)
Merge pull request #251 from yama/bugfix

Fix
Merge pull request #252 from yama/bugfix

PR for bugfix
Fixing #247
Fixing 'Array is currently editing these settings'
fix  info character_set_database and collation_database
Merge branch 'bugfix' of https://github.com/modxcms/evolution into bugfix

# By Thomas Jakobi
# Via Thomas Jakobi
* 'bugfix' of https://github.com/modxcms/evolution:
  Fixing 'Array is currently editing these settings'
  Fixing #247

Conflicts:
	manager/actions/sysinfo.static.php
Now we can specify document ID if needed
DB request only made if $hereId != $modx->documentObject['id']
Merge pull request #253 from yakimoff/develop

Now we can specify document ID if needed
fix   tinyMCE style for use in custom manager theme
Merge branch 'develop' into bugfix

* develop:
  DB request only made if $hereId != $modx->documentObject['id']
  Now we can specify document ID if needed
sample-robots.txt add Disallow: /assets/packages/ #201
fix in $modx->getSettings
Merge pull request #256 from Pathologic/bugfix

fix in $modx->getSettings
http://modx.im/blog/news/1999.html#comment20388

fix bug with save lastlogin time
Merge branch 'bugfix' of https://github.com/modxcms/evolution into bugfix

# By Pathologic
# Via Pathologic (1) and Thomas Jakobi (1)
* 'bugfix' of https://github.com/modxcms/evolution:
  fix in $modx->getSettings
Fix - Don't parse EVAL binding at the TV form
New feature - @@EVAL at the TV form

http://photozou.jp/photo/show/280550/203166462