Feature/analytics

I believe conflicts are resolved now!
This should not be commented. It gets generated by Grunt.