merged working with dev branch
merged working with dev branch

whitef0x0/tellform,whitef0x0/nodeforms,whitef0x0/medforms,whitef0x0/tellform,whitef0x0/nodeforms,whitef0x0/medforms,whitef0x0/tellform,whitef0x0/nodeforms,whitef0x0/medforms