Fixed: try to fix OPENSHIFT DB error
Merge branch 'master' of https://github.com/micros-uz/estore2

Conflicts:
	.idea/workspace.xml