Merge branch 'Kevin'
display none on popup
display none
defects

also bug fixes
Merge branch 'master' into Saumya
Merge branch 'Saumya'
Merge branch 'master' into Kevin