- Merge commit
- Merge changes
Revert ff3c35f..9f53a06

This rolls back to commit ff3c35f5dd5378db7b7c2e0415fe1198e0890e3a.
Metrics

- Added Metrics and functions that access and modify metrics
- Metrics include packets sent, bytes sent, packets recv, bytes recv
- Wrong version of 3GDownloader, correct version is in another repo.
Will fix later tonight
Merge branch 'master' of https://github.com/tohms19/BeaconDisseminationApp

Conflicts:
	app/src/main/java/ut/beacondisseminationapp/mock/Downloader.java