Merge branch 'richard-test' into shashank-test
Merge branch 'master' into shashank-test
Merge branch 'master' into shashank-test
Merge branch 'master' into shashank-test
Merge branch 'master' into shashank-test
delete merge conflict file
Merge branch 'shashank-test'
refactoring
fixed nullpointerexception
asdasd

asdasd
Merge branch 'shashank-test'
Merge branch 'shashank-test'
createinspectionpropertyfragment UI changes