Merge branch 'development'
Added ie fixes
Merge branch 'master' into development