Misc. server side changes
Merge branch 'master' of github.com:teamwork523/MobiPerf

Conflicts:
	server/gspeedometer/controllers/smooth_prototype.py

Merging in server-side changes for RRC inference.
Previous committed branch contained client-side changes only.