more work on merging graphs
Merge git://github.com/Graylog2/graylog2-web-interface into develop