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