added counter to server type
added server count to admin dashboard
fixed merge conflict for adin dashboard server count
Merge branch 'authenticate' into herokuprod