FormApp code refactor
Merge branch 'master' of https://github.com/istvantako/TDS.git