Merge branch 'release/1.1.3' into develop
fix for firefox 34 flex issue
version update
Merge branch 'release/1.1.4'