Rights management
Merge branch 'master' of https://github.com/innoist/ES

Conflicts:
	ES.Web/counter.txt