Updating filtering posts

Post filtering

Merge pull request ushahidi#2061 from ushahidi/statefuldata-nested-ch…

…ange-tracking

Merge branch 'develop' into statefuldata-nested-change-tracking
With the understanding that this will be revisited

Remove tags from the CSV Export. Keep categories with their content (…

…not tag id) (ushahidi#2063)

Add-on to 2028

Revert " 2028 - Sort heading for CSV Export (ushahidi#2053)" (ushahid…

…i#2058)

This reverts commit 3d98d04.

Merge branch 'develop'

remove half-baked submodule

Merge pull request ushahidi#2015 from ushahidi/1975-fixes-csv-export

1975 Returning Entity names as well as ids in CSV

Updating to include CSV export changes

Merge pull request ushahidi#1993 from ushahidi/1886-lock-bug

1986 lock bug