Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	apps/pages/product/components/size-list.vue

@@ -28,7 +28,7 @@
 
 <script>
 import { Scroll } from 'cube-ui';
-import sortby from 'lodash/sortBy';
+import sortBy from 'lodash/sortBy';
 
 export default {
   name: 'size-list',