Added analytics modules
Merge branch 'develop' of github.com:PopShack/alpha into develop