Merge branch 'master' into tims
Added statelite mapview
Merge branch 'tims'