Merge branch 'master' into models

# Conflicts:
#	server/lib/accounts.coffee
#	server/methods/deleteMessage.coffee
#	server/methods/deleteUser.coffee
#	server/methods/eraseRoom.coffee
#	server/methods/setUserActiveStatus.coffee
#	server/methods/updateMessage.coffee
#	server/publications/adminRooms.coffee
#	server/publications/fullUserData.coffee
#	server/publications/userChannels.coffee
#	server/startup/initialData.coffee