adjusted margin of popups
re-added production config
added markers folder to openshift config
removed config
Merge branch 'master' into dev