Merge branch 'release/1.2.4' into develop
fix for firefox 34 flex issue
version update
Merge branch 'release/1.2.5'