Issue #234 Fix tests as they fail with master updates
repair merge - incorrect variables
Merge pull request #320 from DevYah/user_profile_repair

repair merge - incorrect variables
Merge pull request #319 from DevYah/stream_polling_and_sidebar_scroll

Stream polling and sidebar scroll
Merge pull request #303 from DevYah/C3_MahmoudHashish_#234_fix_twitter_tests

Issue #234 Fix tests to pull up with master updates
Merge branch 'master' into stream_polling_and_sidebar_scroll

Conflicts:
	Idearator/app/views/users/show.html.erb