Refactoring: renamed objects
moved out images from db to fs
Merge remote-tracking branch 'origin/develop' into develop
modified application.openshift.properties
fix os path
Merge branch 'dev' into develop