getting everything ready for preliminary show
Merge branch 'development'