Moved FormTypes to FormFactory
Merge branch 'master' of https://github.com/Macsch15/Tricolore