NRRPLT-8723

* [NRRPLT-8723] Changing collab storage files

* Merged development into NRRPLT-8723
* small bug fixes

* Merge branch 'NRRPLT-8723' of bitbucket.org:hbpneurorobotics/nrp-proxy into NRRPLT-8723

* removed unused imports

* [NRRPLT-8723] fixing Basetype methods definition

* fixing tests

* fixed more tests

* Merged development into NRRPLT-8723