make sure development isn't dropping all
fix activity transfer
start of activity display
Merge branch 'development' into datamerge