added browser check
added browser check
fix merge
Merge branch 'dev' into stage
fix issues
add fixes
merge