APD-227: Highlighting of states on mouse hover
APD-227: Set colors to selected state for mouseover and click event
Merge branch 'APD-227' into develop