fixed form type bug
fixed those damn xml deletion issues
Merge branch 'master' of ssh://gh/MazMachine/Coen174