Merge branch 'master' of https://github.com/rollandlee/Hermes

Conflicts:
	js/app/sell/new_product.js