wip on active emps
wip survey changes and inactive users to models
fixed conflict in schema file
finished RC for survey tracking
temp checkin on emps code
Merge branch 'active_emps'
tests passing
tweak UI for survey entry