Removed upgrade file from root folder
Database Upgrade script for 2.7b
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
Fix undefined error when running alerts scheduler #1081

Also readd comment with alert status info
Merge branch '2.7b' of git://github.com/ushahidi/Ushahidi_Web into 2.7b
Revert "Changing HTML editor from jwysiwyg to redactor #815"

This reverts commit c2d0e860c34767539aabf5554ce0dbaf898a9322.
Upgrading JWYSIWYG to fix multiple bugs

* changed some config options to remove some editor options
jwysiwyg fixes

* Make the page description box wider
* Add and reorder controls
* Include js for images, tables and file manager
* Add handler for filemanager
* Fixes to jwysiwyg js to make file uploads work.
* Remove built in handler PHP in jwysiwyg - security risk
Merge pull request #1084 from rjmackay/2.7b

Various fixes
Merge branch '2.7b' into develop
Fixes error on clean_urls. Closed #1071
Merge branch '2.7b' of https://github.com/ushahidi/Ushahidi_Web into develop
Version 2.7
Changelog
Merge branch 'master' into develop
Update i18n submodule - prep for release
Merge branch 'master' into develop
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.