cmy update (them list followings voi list followers)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/scripts/controllers/users/wall.js
	app/scripts/services/UserService.js
	app/views/users/wall.html
	routes/usersRoute.js
	server/controllers/Users.js