Merge origin/development into development
Merge branch 'development'

* development:
  b0c2a6a35144f271ac0372e2c4b9751ac01f8173
  73d3c1bcf0f20fd10040760cc65d23f3d7be91b1
  8a1da0f5618fe93e170083264f02feb0a925e018
  663cae8af1b29b254d84af1944cb1913e3a27363
  035fc453c45d8d1c0e23254fe9431b8692024a3d
  a0cccb2946afb8178b5c50412ff73e19b7bbbea9
  28dc4a65c673a872c6576527fa26b198bafb029e
  2b192e0db20256599fa485d4485d3c181056670f
  37e90ef1cbadc3256c3d0fa93f7639ec68acbecf

Conflicts:
	generator.php
	modules/WoniuHelper.php
	modules/WoniuLoader.php
	modules/plugin.php
	tests/app/controllers/view.php
	tests/pluginfortest.php
	tests/test_view.php
Merge branch 'development' of git@github.com:snail007/microphp.git

* 'development' of git@github.com:snail007/microphp.git:
  cb0631edd2cfecb829f88b8bc1e4752572a665f9
  2fd27eb4ec6a40948ef0f1d715a21a6b5be74237
  ba93f28092015d7917014f1adceb018081afec11

Conflicts:
	MicroPHP.min.php
	MicroPHP.php
	index.php
	modules/cache-drivers/phpfastcache.php
	modules/plugin.php
	plugin.php
Merge branch 'development' of git@github.com:snail007/microphp.git into development

* 'development' of git@github.com:snail007/microphp.git:
  cb0631edd2cfecb829f88b8bc1e4752572a665f9
  2fd27eb4ec6a40948ef0f1d715a21a6b5be74237
  ba93f28092015d7917014f1adceb018081afec11

Conflicts:
	MicroPHP.min.php
	MicroPHP.php
	index.php
	plugin.php
Signed-off-by: snail <arraykeys@gmail.com>
Merge branch 'development'

* development:
  Signed-off-by: snail <arraykeys@gmail.com>

Conflicts:
	MicroPHP.min.php
	MicroPHP.php
	index.php
	plugin.php

Signed-off-by: snail <arraykeys@gmail.com>
Signed-off-by: snail <arraykeys@gmail.com>
Merge branch 'development'

* development:
  Signed-off-by: snail <arraykeys@gmail.com>