Merge branch 'master' into develop
+ avg reg time and clients count for User
Merge branch 'feature-reg-time-clients-count' into develop

Conflicts:
	db/schema.rb
Merge branch 'develop'