Improved admin menu so that streams can easily be assigned to the admin menu
Adding Content/Foo will assign it as a child menu item of Content
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop