product v2
Merge branch 'master' of https://github.com/BeautyNista/nista

Conflicts:
	themes/admin/views/layouts/index.php