fix vcard update ui and functions
add vcard list ui and functions
merge with master tag:201410211400
List personal photo
List vcard personal photo
vcard photo list
fix vcard photo imgContent fn and remove photo in update view
remove empty linefeed
Merge remote-tracking branch 'origin/master' into 03vcard

Conflicts:
	client/env.coffee
	client/marionette/controller/dataform.coffee
	client/marionette/controller/roster.coffee
	client/marionette/controller/vcard.coffee
	client/marionette/url/muc.coffee
	client/marionette/url/roster.coffee
	views/main.less
remove empty linefeed