Merge branch 'master' into sandstorm-port-001

Conflicts:
	.meteor/packages
	.meteor/versions
	client/lib/avatar.coffee
	client/views/app/sideNav/userStatus.html
	packages/rocketchat-oembed/client/oembedImageWidget.coffee
	server/lib/accounts.coffee
	server/startup/initialData.coffee