fixed bug in flowplayer css inclusion
local commit. In order to solve a confict
Merge branch 'origin/consilia'