Added message counts
Merge branch 'master' of github.com:sprshrp/api_et_prototype