add videoPlayer
Merge branch 'master' of github.com:ostapetc/Yii-CMS-2.0
doc_block autoimport and save class metadata
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/media/portlets/views/videoPlayer.php