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

Authored by crisbal on Oct 28 2016, 5:35 PM.