Merge branch 'twitterapi-show-user' into 'develop'