Update OU Qtype gapselect for simplified forms #6609
Bump version number for the 2.5-compatible release.
move combinable hooks out of combined qtype plug in

and into their respective question type plug ins.
fixing @package and removing @subpackage
moved lang strings for combinable sub questions to

their question type directories
Merge pull request #10 from jamiepratt/wip_move_combinable_dirs

Wip move combinable dirs