Merge branch 'development'

Conflicts:
	modules/WoniuController.php
	tests/app/controllers/view.php

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