gx
Merge branch 'master' of https://github.com/Foboy/ACIA

Conflicts:
	trunk/Presentation/Nop.Web/Administration/Bin/Nop.Core.dll
	trunk/Presentation/Nop.Web/Administration/Bin/Nop.Data.dll
	trunk/Presentation/Nop.Web/Administration/Bin/Nop.Services.dll
	trunk/Presentation/Nop.Web/Administration/Bin/Nop.Web.Framework.dll