karelly
Merge branch 'master' of https://github.com/Karelly/AWCOnlineStore into Karelly-master

Conflicts:
	AWCOnlineStore/UpgradeLog.XML
Merge branch 'Karelly-master'