Added a new property to help define the use of a specific host
Modified the UI, for the added a new property
Merge branch 'feature/serverType' into develop
Merge branch 'release/1.2'