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

Conflicts:
	themes/admin/assets/js/stocks.js