Merged with Adrias final QSR changes. 

This is a manual merge between adria/3d-annotation-tool @ commit =  281d44ff16eeda41b84cb0e2a7e7e58439121d71 and akshaya/3d-annotation-tool. Now it needs to be pull-requested to strands-3d-annotation-tool. Working confirmed with the exception of the inclusion of app_info.xml replacement along with Annotation_toollist_objects.xml. This file now needs to be manually replaced as Annotation_toolapp_info.xml - manually.