Merge branch 'release/2.4.0'
Merge branch 'develop'
added test for windows phone and modified navbar to allow dropdowns