Merge remote-tracking branch 'origin/master'
Merge branch 'gabriel' into jem
Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into gabriel
Fix list and data entry button