Textfields to input column titles
fix
resolved merge conflicts
Merge branch 'andersenyang-master'