no message
Merge branch 'master' of https://github.com/Nitaro16/nitaro

Conflicts:
	footer.php
	left_menu.php
	shop.css
	top.php