Merge branch 'dev'
home page dropdown
Merge branch 'lee'