Zhu Jinhui 0a31b33423 Merge dev to master 7 anni fa
..
configure 0a31b33423 Merge dev to master 7 anni fa
controller 0a31b33423 Merge dev to master 7 anni fa
plugins 0a31b33423 Merge dev to master 7 anni fa
view 0a31b33423 Merge dev to master 7 anni fa
Bootstrap.php 0a31b33423 Merge dev to master 7 anni fa