fixed bullet collision problem
Merge branch 'stevesbranch'