renamed properties to match their intended function
updated configuration details for Trifecta UI
Merge branch 'feature/web_ui' into scala_2.11

* feature/web_ui:
  updated configuration details for Trifecta UI
  renamed properties to match their intended function