commit edit profile
Merge remote-tracking branch 'origin/master'
commit edit profile lan 2
commit edit profile
customiseSetting
//cmy
commit edit profile
customiseSetting
//cmy lan 2
commit edit profile
customiseSetting
//cmy lan 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/users/wall.js
	app/scripts/services/UserService.js
	server/controllers/Users.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/users/wall.js
	app/scripts/services/UserService.js
	server/controllers/Users.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/users/wall.js
	app/scripts/services/UserService.js
	server/controllers/Users.js
customiseSetting lan n