I did things. namely the friends list and the little whats on your mind thing
Merge branch 'master' of http://github.com/hsad/cocaine

Conflicts:
	Cocaine/src/Merc.js
	Cocaine/src/wallFeed.js