revise ParseManager class query for custom users
include project.pbxproj file
resolve merge conflict with project.pbxproj