fix correlation-between-hc-equip
fix-user-type
fix some UX ticket in redmine
add report gps
Merge branch 'master' into spare-part-modup