Merge origin/master

Conflicts:
	app/index.php
	app/model/yg.php
	app/module/menu/module.php
	app/module/menu/view/item.php
	app/view/footer.tpl
	app/view/header.tpl
	index.php