Merge pull request #30 from DannyJoris/7.x

removed duplicate form xml file and fixed a form read bug
uncommitted code
fix merge conflict