Merge branch 'remove-twitter-api' into 'develop'