learningequality/ka-lite — pull request #2275 by rtibbles (2014-07-28 17:48:50+00:00)
Title: Merge Nalanda RCT2 and Release-0.12.0 into Develop

Bring develop in line with all latest features and bug fixes from other branches. Hold off merging until review and merge of #2274.