Implements twitter api changes - use of oauth2. Fixes #801
fix a conflict
Merge branch 'develop' of https://github.com/ushahidi/Ushahidi_Web into develop
Removing unnecessary files in teh twitter oauth library
Merge branch 'develop' of https://github.com/ushahidi/Ushahidi_Web into develop
Better XSS protection

* Add HTMLPurifier library (LGPL)
* Add helper functions to html helper
* Set default encoding header to UTF-8
* Make sure the doctype is the same everywhere (admin/members/frontend)
* Remove use of strip_tags() and htmlspecialchars()
* Replace vanilla htmlentities with html::escape() - make sure no one forgets the UTF-8
* Remove _csv_text() fn - no longer used and was using strip_tags()
html::clean() : Make allowed tags and iframes configurable
Fix custom formsfield validation #671

* Actually return sane error messages
* Push errors directly into $post object
* Bind all error to 'custom_field' rather than trying to bind to
  individual fields as this didn't work and meant no errors were displayed
* Still a bit broken since only the last error will get displayed,
  not great if you have 10 errors and only see 1
* Fix unit test to grab the errors from the $post object
Merge pull request #1058 from aoduor/develop

Fix custom form fields validation #671
Add info message about allowed html tags
Clarify what facebook settings are for. Closes #1059
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Fix incidents API returning spam comments. Closes #1002
Fix unicorn theme with man nav items. Closes #952
Fix redirect to addons/plugins when clean urls are off. Closes #1061
Fix form field visibility/submission permissions. Close #744

* customforms::get_custom_form_fields() wasn't honoring the
  action type: submit/view
Fix #906 - make form_field.field_default TEXT column

Also make ispublic fields match role_id otherwise we get errors for role_id
greater that 127
Remove unneeded output in submit_custom_forms view

Makes this match whats loaded in admin/manage/forms/main view
Fix custom form fields permissions issues #695

* Form field mismatch function wasn't returning sane results, rewritten
to join to the roles table as other customforms queries do.
* Field validation was checking role id against access_level. Fix to compare
access level with access level
* Fix 'view only' fields in edit to actually have data
Fix display of custom fields in admin - remove float