Change GUI and GUI2 to be apps rather than core features

Change-Id: I862e5bdbccc29fd78716159e168e7a14bc5053e1
diff --git a/tools/test/cells/demo b/tools/test/cells/demo
index 6211ed9..73137dc 100644
--- a/tools/test/cells/demo
+++ b/tools/test/cells/demo
@@ -6,6 +6,6 @@
 export OC3="10.0.3.103"
 export OCN="10.0.3.1"
 
-export ONOS_APPS=drivers,openflow,proxyarp
+export ONOS_APPS=gui,drivers,openflow,proxyarp
 
 alias sshnet="ssh onos@$OCN"