Merging master
Merging master

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