Add basic models; add startup script to load test data
Merge remote-tracking branch 'origin/master'