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

Authored by grigoletti on Dec 3 2016, 6:49 PM.