Merge branch 'dev' of https://github.com/metalgvc/monstra-cms into metalgvc-dev

Conflicts:
	plugins/box/filesmanager/views/backend/index.view.php