fix dev
fix master
Merge branch 'dev' into stage
Merge branch 'stage'
added browser check
added browser check