Change to use the no-namespaces branch of yii-extension
Merge branch 'master' of https://github.com/Crisu83/yii-filemanager

Conflicts:
	components/FileManager.php