?
small fixes
DS
fixed merge conflicts
neatened grammar
rid of public assets