added quota and usage models
dealing with merge of development.log is annoying
merge conflicts with log