First commit
Merge remote-tracking branch 'origin/2.2/develop' into 2.2/develop
Added addons/default
Added upload directory
Small plex parser change
Merge branch '2.2/develop' of https://github.com/pyrocms/pyrocms into 2.2/develop