Adding markdown short description functionality to modules
Composer deps
Cleanups
Merging conflicts