adding option to disable upload options client-side
Merge branch 'master' of ssh://github.com/kitinfo/tracker-panel