Merge branch 'development'
Library of flowplayer for now will remove shortly
Hotfix on console.log
Merge branch 'master' into development