Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

# Conflicts:
#	website/server/controllers/api-v3/chat.js
#	website/server/libs/pushNotifications.js
#	website/server/models/user/schema.js

website/client/components/chat/chatCard.vue

@@ -166,7 +166,7 @@ export default {
     },
     date (value) {
       // @TODO: Vue doesn't support this so we cant user preference
-      return moment(value).toDate();
+      return moment(value).toDate().toString();
     },
   },
   computed: {