fixed typo
fixed missing user alert
Merge branch 'master' of https://github.com/peny/tweetweek