Adding editable fields to Info screens
Merge remote-tracking branch 'origin/master'
Adding editable fields to Info screens
Commits to try and merge Quy’s code
Removed old code