Merge branch 'production' into dev
updated flash plugin to fix bug with seleniumsupport
Merge branch 'dev' into production