Fixed erroneous merge

Fixed errors while merging, added useScissor option and scissors so that
all the content is drawn inside of it, even if text is too long