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

Increase oauth token TTL to 1 day

Remove check for mange messages

Release v3.7.1-rc.1

fixes to release routines

Release v3.6.4 (ushahidi#1707)

**New Features**
- Added Field Level Locking to Surveys
- Improved Survey UX
- Added Task Level Visibility
- Added Webhook Support
- Added Webhook UX
- Added Webhook events fro Create, Update of Post
- Added Survey Duplication 
- Added Task Duplication
- Added Support for OSS deployment with Ushahidi Mobile
- Added Deeplinking for iOS and Android
- Added Banner ads for iOS and Android
- Adding Location Search Picker for Maps in Posts
- Added reply to twitter via Post feature
- Added support for hierarchical categories
- Added Category field type to Survey
- Added Markdown field type to Survey
- Add tags dynamically directly from Posts
- Added language switching for all users


**Minor improvements and fixes**
- Adding uglify-friendly code to colors
- Confirming on delete for unsaved surveys, tasks and fields
- Upgrade node to v6
- Resolved twitter duplication bug
- Display number of unmapped posts to timeline
- Moved Savedsearches to Modal
- Moved Filter to Modal