fixed code style
fixed location component bugs
Merge branch 'bugfix/location-type' into develop