Fix double encoding in main reports block

Conflicts:

	application/i18n
Set HTMLPurifier to user application/cache for serializer path

Avoids adding another writable directory.
Quick fix for fatal errors in VideoEmbed library

Cases where video embed wasn't recognised weren't being handled.
Fix error in helpers/reports.php when uploading to CDN #1099
Fix double encoding in main reports block
Set default values for allowed html and iframesi #1056

This avoids errors if upgraders don't update config.php

Conflicts:

	application/i18n
Alias incident table in case there's a prefix.
Use i as an alias and also alias tables in subqueries.
Merge pull request #1105 from jlewallen/develop

Alias incident table in case there's a prefix.
Merge branch 'master' into develop
Add extra filter button feature #1064

This will add feature to add controls for filter from plugin.
Merge #1089 branch 'HTSolution-develop' into develop
Fixes to Requirements and themes

* Make plugin::add_javascript and plugin::add_stylesheet work again
  Reverting some changes, and add function to get just filenames back
* Add Themes->plugin_requirements() and call this after other requirements
  are loaded.
* Check api_url isn't empty before adding to requirements
* Fix Requirements handling of IE CSS files
* Only add admin combine files groups if we've actually enabled admin
  theming
Another table_prefix issue (application/helpers/customforms.php)
Merge pull request #1112 from alexandro82/develop

Another table_prefix issue (application/helpers/customforms.php)
When there's a prefix, table name escaping creates SQL error.
Merge pull request #1118 from jlewallen/develop

When there's a prefix, table name escaping creates SQL error.
Fix hidden location on reports detail page #1121
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Set empty riverid when one is not supplied for new users.