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

* development:
  5c5168bda8fa86fe4bf770036dad30208874ee13
  Signed-off-by: snail <arraykeys@gmail.com>
  Signed-off-by: snail <arraykeys@gmail.com>
  ef5239de74ddcd28cd50c81aad28b220a321f6eb
  9857f107eee2319f6792a8a93d4f50ca841b4458
  be2af9d05d4cc6de45a449dc3c3dd376d6d064d4
  4d49cad22ee5d15530aea04e4dc074c62f13c903
  1b82024c1f7e307499705044e6d118947808a692
  b6c725a5e7caf791e7df7f711476ca02a6966510

Conflicts:
	generator.php
	modules/WoniuInput.class.php
	modules/WoniuRouter.php
	modules/cache-drivers/drivers/files.php
	modules/cache-drivers/drivers/sqlite.php
	modules/library/FileUploader.class.php
Signed-off-by: snail <arraykeys@gmail.com>
Merge origin/development into development
Merge origin/development into development

Conflicts:
	CHANGELOG.txt
Merge origin/development into development

Conflicts:
	CHANGELOG.txt