Saludando en Github
Merge branch 'master' of https://github.com/talleragile/AWCOnlineStore

Conflicts:
	AWCOnlineStore/UpgradeLog.XML