fix: removed json loading to it's own route
Merge branch 'michael' of https://github.com/satra/Papaya into satra-michael

Conflicts:
	src/js/volume/volume.js
Fixed conflicts for merge.