Zhu Jinhui 0a31b33423 Merge dev to master 7 rokov pred
..
app.ini 0a31b33423 Merge dev to master 7 rokov pred
db.ini 0a31b33423 Merge dev to master 7 rokov pred
router.config.php 0a31b33423 Merge dev to master 7 rokov pred