Reworked some models, refactored js code:

- collectionJson module
- started upload directive in collectionJson
- view to test