Now moduscollect is working, upload working.
Nu mergat§
Merge branch 'master' of github.com:simgul-1/modus

Conflicts:
	app/routes.js