COMMENTED !! Sooooooo beautiful !
Merge remote-tracking branch 'origin/master'

Conflicts:
	wikiinfo.cpp