Remove part of merge conflict.
Remove part of merge conflict.

jeroendesloovere/forkcms,Katrienvh/forkcms,tommyvdv/forkcms,Thijzer/forkcms,matthiasmullie/forkcms,carakas/forkcms,carakas/forkcms,dmoerman/forkcms,ikoene/forkcms,jeroendesloovere/forkcms,jessedobbelaere/forkcms,sumocoders/forkcms,carakas/forkcms,jeroendesloovere/forkcms,nosnickid/forkcms,jeroendesloovere/forkcms,Saxithon/gh-pages,jessedobbelaere/forkcms,carakas/forkcms,tommyvdv/forkcms,tommyvdv/forkcms,sumocoders/forkcms,dmoerman/forkcms,vytsci/forkcms,ikoene/forkcms,jonasdekeukelaere/forkcms,jacob-v-dam/forkcms,riadvice/forkcms,vytsci/forkcms,wengyulin/forkcms,jacob-v-dam/forkcms,matthiasmullie/forkcms,jacob-v-dam/forkcms,DegradationOfMankind/forkcms,DegradationOfMankind/forkcms,jonasdekeukelaere/forkcms,riadvice/forkcms,bartdc/forkcms,mathiashelin/forkcms,mathiashelin/forkcms,forkcms/forkcms,nosnickid/forkcms,jessedobbelaere/forkcms,ikoene/forkcms,sumocoders/forkcms,sumocoders/forkcms,Katrienvh/forkcms,Saxithon/gh-pages,sumocoders/forkcms,nosnickid/forkcms,Thijzer/forkcms,bartdc/forkcms,bartdc/forkcms,mathiashelin/forkcms,mathiashelin/forkcms,DegradationOfMankind/forkcms,matthiasmullie/forkcms,wengyulin/forkcms,Thijzer/forkcms,riadvice/forkcms,forkcms/forkcms,jonasdekeukelaere/forkcms,forkcms/forkcms,Katrienvh/forkcms,jonasdekeukelaere/forkcms,jacob-v-dam/forkcms,vytenizs/forkcms,jonasdekeukelaere/forkcms,vytenizs/forkcms,vytsci/forkcms,wengyulin/forkcms,forkcms/forkcms,justcarakas/forkcms,DegradationOfMankind/forkcms,dmoerman/forkcms,riadvice/forkcms,justcarakas/forkcms,jessedobbelaere/forkcms,tommyvdv/forkcms,Katrienvh/forkcms,vytenizs/forkcms,justcarakas/forkcms,WouterSioen/forkcms,carakas/forkcms,WouterSioen/forkcms