Added support for components in partials
Merge branch 'develop' into dynamic-partials
Tidy up code a lil