Adding cyride maps
Merge pull request #10 from seancavanaugh/cyride_maps

Adding cyride maps
added maps stuff
Merge branch 'master' of https://github.com/CyBite/skynet into resResults

Conflicts:
	CyBite App/AndroidManifest.xml
Merge branch 'maps_manifest_stuff' of https://github.com/seancavanaugh/skynet into resResults

Conflicts:
	CyBite App/AndroidManifest.xml
Fixed changes and merged swans changes into branch.
Removed unused buttons