Gpii 120

Initial pull request for refactored summer demos for http://issues.gpii.net/browse/GPII-120

Also will include a pull on universal.