Merge branch 'update/pleroma-fe-20181114' into 'develop'