Merge origin/master

Conflicts:
	store_app/views/blog/single.php