Fixed adding in device info data, adding in device property data in progress
Merge branch 'rrc_inference_with_export' of github.com:sanaerosen/MobiPerf into rrc_inference_with_export

Conflicts:
	server/gspeedometer/controllers/archive.py
Fixing merge of a7ee72310d5c909d70e0c6bdd7b25cf45aa91a49