Moved server address into options file. AH-277
Merge remote-tracking branch 'origin/AH-277_Demo_5' into AH-277_Demo_5
Change default server address. AH-277