Merge branch 'develop'
fix for firefox, css
Merge branch 'master' into develop