Merge branch 'master' of https://github.com/fastcatgroup/analytics.git

Conflicts:
	analytics-server/src/main/java/org/fastcatgroup/analytics/web/controller/CTRController.java