Merge branch 'master1' of /Users/adeshbanvait/Desktop/Workspace/snapgram with conflicts.
bulk upload almost working, needs parameters for session ids for full functionality