lobby easter egg for status
Merge pull request #3705 from birarda/lobby

lobby easter egg for status
Add edit entities help window
Merge pull request #3706 from huffman/entity-tool-help

Add edit entities help window
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties