Merge branch 'develop' of github.com:CubingChina/cubingchina into develop
Fix sorting for location_id
Merge branch 'develop'