update
Merge branch 'master' of https://github.com/billivycarter/shopifymeta into textarea

Conflicts:
	metafields.js
the update