Check point push
99 problems and a bitchy one
before merge
Merge remote-tracking branch 'origin/master' into yermakov

Conflicts:
	web-store-persistent/pom.xml
merged