DRMP tweaks, add 'Academic' organisation_type. Small optimisation of
inline_component.
Bugfix InlineComponent
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc
Merge branch 'master' of git://github.com/flavour/ifrc_qa