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

Authored by atundo on Oct 11 2016, 10:47 PM.