User and occupancy updates
Merge branch 'development'
Final updates