sorted importjob file
trying to resolve conflicts
deleting importJob
Merge branch 'master' of https://github.com/prj2113/usergrid into import-pooja