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

Authored by crisbal on Nov 1 2016, 11:44 AM.