modified:   .idea/workspace.xml
Merge branch 'master' of github.com:imilyukov/awsmarket

Conflicts:
	.idea/workspace.xml
	modified:   skin/frontend/awsmarket/default/css/style.css