Merge branch 'develop'

Author: birdofpreyru

src/shared/components/Avatar/index.jsx

@@ -1,9 +1,12 @@
 import DefaultUserAvatar from 'assets/images/default-user-avatar.svg';
 import React from 'react';
 import { themr } from 'react-css-super-themr';
-import { Avatar } from 'topcoder-react-utils';
+import { Avatar as ProtoAvatar } from 'topcoder-react-utils';
 
 import theme from './style.scss';
 
-export default themr('Avatar', theme)(props =>
-  <Avatar DefaultAvatar={DefaultUserAvatar} {...props} />);
+function Avatar(props) {
+  return <ProtoAvatar DefaultAvatar={DefaultUserAvatar} {...props} />;
+}
+
+export default themr('Avatar', theme)(Avatar);

src/styles/mixins.scss

@@ -1,3 +1,3 @@
 @import "_mixins/variables";
-@import "../../node_modules/topcoder-react-utils/src/styles/mixins";
+@import "~topcoder-react-utils/src/styles/mixins";
 @import "_mixins/typography";