Added dynamic connection according to the app properties
Merge branch 'develop' of https://github.com/entirej/incubator into develop