Zhu Jinhui 73f2df5555 Merge dev to master 7 lat temu
..
actions d123dcd681 Update file 7 lat temu
configure fd365ee3f6 Fixed Router error 7 lat temu
controller 73f2df5555 Merge dev to master 7 lat temu
helper 73f2df5555 Merge dev to master 7 lat temu
i18n d123dcd681 Update file 7 lat temu
model d123dcd681 Update file 7 lat temu
plugins 0a31b33423 Merge dev to master 7 lat temu
view 73f2df5555 Merge dev to master 7 lat temu
Bootstrap.php 0a31b33423 Merge dev to master 7 lat temu