#135 more fixing
Merge branch 'master' of https://github.com/DataViva/dataviva-site