current state of development
Merge branch 'play' of github.com:Graylog2/graylog2-web-interface into play

Conflicts:
	app/lib/Api.java