Feature/analytics

I believe conflicts are resolved now!
You could add [NetBeans.gitignore](https://github.com/github/gitignore/blob/master/Global/NetBeans.gitignore) to your global Git ignore.