removal of track references
renamed variable
corrected bulk upload
Merge branch 'dev' into activities

* dev:
  corrected bulk upload
  renamed variable
  removal of track references