Merge
Merge branch 'master' of https://github.com/webdevleo/webplayer
But of minimize functionality
Merge branch 'master' of https://github.com/webdevleo/webplayer
Atomar commit
Fix conflict
Merge branch 'master' of https://github.com/webdevleo/webplayer
Merge changes
Add minimize, maximize and close functionality
Resolve conflict