Updated TwitterController to conform to the new TwitterApplication model
removed sass cache
Fixed merge conflicts