Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn

Authored by crisbal on Oct 16 2016, 7:43 PM.