Set default values for allowed html and iframesi #1056

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

Conflicts:

	application/hooks/2_settings.php
Merge branch '2.7b' into develop
Merge branch '2.7b' of https://github.com/ushahidi/Ushahidi_Web into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Update application/controllers/reports.php for Ushahidi deployments with table prefix
Merge pull request #1104 from alexandro82/develop

Update application/controllers/reports.php
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