adaptlearning/adapt_framework — pull request #38 by darylhedley (2013-12-19 12:35:08+00:00)
Title: Feature/36+37

Fixes issues #36 & #37