Admin layout fix
Merge branch 'master' of https://github.com/ozgury/eCrafting

Conflicts:
	themes/core/cleanslate/templates/admin.html