village_activity test modified...?
village_activity changed
commented weird scopes yet again
Merge branch 'exp'
more conflictsss