small bug fix (loading initial message) and clean up
fixed typo
Merge branch 'feature/webui' into scala_2.11

* feature/webui:
  fixed typo
  small bug fix (loading initial message) and clean up