Fixed counter
Merge branch 'counter' into develop
Merge branch 'develop'
Merge branch 'master' of https://github.com/EthicalCode/webapp