Feature/analytics

I believe conflicts are resolved now!
We don't need to annotate dependencies; ngAnnotate does this for us in the build step.