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