no message
Merge branch 'master' of https://github.com/Chinader/sushi_loko

Conflicts:
	includes/header.php