Merge branch 'release/2.2.0-beta2' into 2.2/master
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/master
Merge branch '2.2/master' of github.com:pyrocms/pyrocms into 2.2/master
Initial commit of files module refactor
Progress on files library
More progress on files
Update system/cms/modules/addons/details.php

Add class "modal" to "Upload" link for themes. So the upload form appears into a dialog, and not into a plain white page.
Convert Eloqent object to array to add extra items
Merge remote-tracking branch 'upstream/2.3/develop' into filesrefactor
Merge pull request #2393 from tristanjahier/2.2/develop

Update system/cms/modules/addons/details.php
Progress on conversion
Dirty hack to get places listing tree working
Updated search method and added model functions
Updated delete_file method
Updated replace_file method
Updated rename_file method
Updated synchronize method
Improved some more methods
Updated move method
Updated upload method