Merge branch 'development'

* development: (80 commits)
  a752deae5f84c794adc1a2091a8ef573696198df
  b9996915a78f9668053a9203b5d678c987569154
  0779861bdd67104e18413806a96bace9be9743c5
  bc25f7c82902d0d69fa360fa3be574c384ea66cd
  2e0e512e87bdf68c93bffb45649d74aa56f5331c
  44b01625d739a3fa55fd11329991ea593f412b7a
  d0f3cdc335a8af2abc62a7bd7ffb46cce026b7ca
  c9cfd55afa59a2f171972355d3b9cff082aab15f
  43f4135845c8361da622fa4173c76074df515f45
  b1c40435ebe598d7c5241bbfc0029665387ca8d9
  Signed-off-by: snail <arraykeys@gmail.com>
  Signed-off-by: snail <arraykeys@gmail.com>
  Signed-off-by: snail <arraykeys@gmail.com>
  ada937030e4f8f1d94c9cfde7d14643ac945973d
  03714f9ae34fc5f9cba750f5b241534b9a5ccdb8
  6cdc275a04d9e511aa4f2d6ae155e6e083a18c1c
  b7053b9f1cd590ab25e568a0c85a8f6f2f1d36f1
  9bb67bf0741e37b7fdcf1b480b41f1197ead6959
  830b86e4b75f55c6ae93610f7159a4e58e3c58f4
  b423417c87079818f60c7e4a727302efe908b07f
  ...

Conflicts:
	generator.php
	modules/WoniuController.php
	modules/WoniuHelper.php
	modules/WoniuInput.class.php
	modules/WoniuLoader.php
	modules/WoniuModel.php
	modules/WoniuRouter.php
	modules/helper/html.helper.php
	modules/plugin.php
	tests/app/controllers/route.php
	tests/app/controllers/validator.php
	tests/app/controllers/welcome.php
	tests/app/helper/function.php
	tests/app/modules/hmvc_demo/hmvc.php
	tests/pluginfortest.php
	tests/test_autoload.php
	tests/test_db.php
	tests/test_view.php
Merge branch 'HEAD' of http://git.oschina.net/snail/microphp.git

* 'HEAD' of http://git.oschina.net/snail/microphp.git:
  Signed-off-by: snail <arraykeys@gmail.com>

Conflicts:
	tests/app/library/sub/SubLibAuto.class.php
Signed-off-by: snail <arraykeys@gmail.com>
Merge branch 'development'

* development:
  Signed-off-by: snail <arraykeys@gmail.com>
Signed-off-by: snail <arraykeys@gmail.com>
Merge origin/development into development