fixed negative boundary
fixed one conflict
fixed MyProjectsActivityTest#testInvalidProject
fixed hopefully another testcase