moved
master
Merge branch 'master' of https://github.com/WSO2Mobile/mobilestore
resolved
Conflicts:
	acs.jag
	assets/mobileapp/pages/modules/event.js
	modules/event.js
	store-tenant.json