Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'