start of loading code of flowedit
Merge remote-tracking branch 'origin'
cleanup compilation warning