EditProductPage + DataConnection
EditProductPage + DataConnection v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	JTM/vwd.webinfo
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 92c7347640ec49f30c00cdab8273204e2b78277e.