Merge branch 'tcuje' into dev
test setup for location(not running)
bugfix StoarageHandler catch NaN in MeasureActivity