Merge branch 'accelerometerforce' into abhinav
Merge branch 'abhinav'
fixed errors
fixing more errors