Updated Mobile HAR template
Updated test templates.
Changed table name in UploadServlet.
Updated templates.
Revised Sensor Collection Options for Field Trial
Merge remote-tracking branch 'upstream/master'