ADAM / AIAHTML5

… AnnotationPopupActiveButton

Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
	400-SOURCECODE/AIAHTML5.Web/index.html

Bug #6656: Disectibel Anatomy > Modesty setting doesn't work correctly
Bug #6697: Dissectible Anatomy > Gender doesn't change after changing the Skin Tone
Bug #6591: Dissectible Anatomy > Correct the height of the search drop down box

Highlight on 0th layer> click anywhere to highlight> extract> again highlight and then layer change. It shows changed layer Body but in a while it comes back to the 0th layer view with previously highlighted portion.

Fix: getting grayiamge data not from updated gray data fro layer change. this partially resolves issue. but the highloghtbody is called more than once. need to see.

…image of hand became black. This is fixed now.

Blacking issue on highlighted body region in Lateral Arm

loading icon in list manager place changed.

Crash browser if we do first highlight Body in gray scale>click somewhere and highlighted>extract>then again back to highlight button click from left tool bar buttons list

1)Active button implemented
2)Deleting Pin

2. above fixed highlight issue in body views except lateral arm.
3. pushed elevent data on body view switch for settings and also changed $scope.vieworientataionid to $rootscope.vieworioentataionid for settings.
4. tried to fix highlight in lateral arm but not resolved.

…TML5 into AnnotationToolBar_latest

# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/Web.config
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
#	400-SOURCECODE/AIAHTML5.Web/index.html

# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
#	400-SOURCECODE/AIAHTML5.Web/index.html