GPII-154: Fixed the way to identify discover icon.
GPII-154: Fixes according to the code review feedback.
Merge pull request #2 from jhung/GPII-130

Gpii 130
GPII-130: Make the key binding for hiding the toolbar configurable.