Closes  #44
Merge branch 'develop'
Enabled local analytics bd to test