Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

app/controllers/user.js

@@ -64,7 +64,7 @@ class UserController extends SiteController {
     router.param('coreUserId', this.populateCoreUser.bind(this));
 
     router.post(
-      '/core/:userId/settings',
+      '/core/:coreUserId/settings',
       limiterService.create(limiterService.config.user.postUpdateCoreSettings),
       checkProfileOwner,
       upload.none(),

app/views/user/components/profile-icon.pug

@@ -1,5 +1,5 @@
 mixin renderProfileIcon (user, title, size)
-  if user.core
+  if user.coreUserId
     img(
       src=`http://${user.core.meta.domain}/core/user/${user.coreUserId}/picture?s=${size || 'small'}`,
       title= title,