Merge branch 'develop'
git notes
twitter single user OAuth