Merge remote-tracking branch 'upstream/master'

Include change in model.py in Observation (removed) and Neo tables