Took collect-view code for the gateway + tools folder
Merge branch 'development' of https://github.com/AnthonyDeroche/pidr into development