working
working
working on passing into woo commerce
working
working
working
Merge branch 'master' into dev_server2

Conflicts:
	.gitignore