Adapted counter.php to Coding standard
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Gruntfile.js
	counter.php
Adapted joinus.php to Coding standard