Successfully combined all interfaces from both ChatUI and Front Page UI. UI's will need new widgets to have the WiFI functionality required but it is all one app now.
Merge branch 'Develop' of https://github.com/irblake/Spot into Develop

Conflicts:
	DummyWiFi/AndroidManifest.xml