fixed dropdown for stupid browsers
Merge branch 'master' into development