Merge branch 'master' of http://github.com/Squall47/hearthstone

Conflicts:
	vue/layout.php