Stripped out some rest calls to the server that could have been  overworking the server on dashboard calls
Merge branch 'development' of https://github.com/BaobabHealthTrust/DDE2 into development