Added popup manager
Updated to spaces for Brian
Merge pull request #199 from adaptlearning/issue/198

Added popup manager
Merge branch 'develop' into issue/#200

* develop:
  Updated to spaces for Brian
  Added popup manager