Data conf
Merge branches 'master' and 'master' of github.com:dulichan/wso2store

Conflicts:
	dataconf.json