Newsfeed cleaned up and polished
Merge remote-tracking branch 'hturlapati/master'

Conflicts:
	client/home.html