Developing client
Merge branch 'master' of https://github.com/isiloron/shiny-bear
Continuation of client development.
Merge branch 'master' of https://github.com/isiloron/shiny-bear