Merge branch 'dev' into production
updated firefox for selenium to the lastest for ubuntu 10.04
Merge branch 'production' into dev