diff --git a/application/views/admin/messages/messages_twitter.php b/application/views/admin/messages/messages_twitter.php
diff --git a/application/views/admin/reporters/main.php b/application/views/admin/reporters/main.php
diff --git a/application/views/admin/reporters/reporters_js.php b/application/views/admin/reporters/reporters_js.php
diff --git a/application/views/admin/reports/download.php b/application/views/admin/reports/download.php
diff --git a/application/views/admin/reports/download_js.php b/application/views/admin/reports/download_js.php
diff --git a/application/views/admin/reports/edit.php b/application/views/admin/reports/edit.php
diff --git a/application/views/admin/reports/main.php b/application/views/admin/reports/main.php
diff --git a/application/views/admin/reports/reports_extra.php b/application/views/admin/reports/reports_extra.php
diff --git a/application/views/admin/reports/reports_js.php b/application/views/admin/reports/reports_js.php
diff --git a/application/views/admin/reports/translate.php b/application/views/admin/reports/translate.php
diff --git a/application/views/admin/reports/translate_js.php b/application/views/admin/reports/translate_js.php
diff --git a/application/views/admin/reports/upload.php b/application/views/admin/reports/upload.php
diff --git a/application/views/admin/reports/upload_success.php b/application/views/admin/reports/upload_success.php
diff --git a/application/views/admin/settings/api/api_js.php b/application/views/admin/settings/api/api_js.php
diff --git a/application/views/admin/settings/api/banned.php b/application/views/admin/settings/api/banned.php
diff --git a/application/views/admin/settings/api/banned_js.php b/application/views/admin/settings/api/banned_js.php
diff --git a/application/views/admin/settings/api/logs.php b/application/views/admin/settings/api/logs.php
diff --git a/application/views/admin/settings/api/logs_js.php b/application/views/admin/settings/api/logs_js.php
diff --git a/application/views/admin/settings/api/main.php b/application/views/admin/settings/api/main.php
diff --git a/application/views/admin/settings/cleanurl.php b/application/views/admin/settings/cleanurl.php
diff --git a/application/views/admin/settings/email.php b/application/views/admin/settings/email.php
diff --git a/application/views/admin/settings/email_js.php b/application/views/admin/settings/email_js.php
diff --git a/application/views/admin/settings/externalapps/externalapps_js.php b/application/views/admin/settings/externalapps/externalapps_js.php
diff --git a/application/views/admin/settings/externalapps/main.php b/application/views/admin/settings/externalapps/main.php
diff --git a/application/views/admin/settings/facebook/main.php b/application/views/admin/settings/facebook/main.php
diff --git a/application/views/admin/settings/https.php b/application/views/admin/settings/https.php
diff --git a/application/views/admin/settings/main.php b/application/views/admin/settings/main.php
diff --git a/application/views/admin/settings/settings_js.php b/application/views/admin/settings/settings_js.php
diff --git a/application/views/admin/settings/site.php b/application/views/admin/settings/site.php
diff --git a/application/views/admin/settings/site_js.php b/application/views/admin/settings/site_js.php
diff --git a/application/views/admin/settings/sms.php b/application/views/admin/settings/sms.php
diff --git a/application/views/admin/sharing/sharing.php b/application/views/admin/sharing/sharing.php
diff --git a/application/views/admin/sharing/sharing_js.php b/application/views/admin/sharing/sharing_js.php
diff --git a/application/views/admin/stats/country.php b/application/views/admin/stats/country.php
diff --git a/application/views/admin/stats/hits.php b/application/views/admin/stats/hits.php
diff --git a/application/views/admin/stats/impact.php b/application/views/admin/stats/impact.php
diff --git a/application/views/admin/stats/main.php b/application/views/admin/stats/main.php
diff --git a/application/views/admin/stats/punchcard.php b/application/views/admin/stats/punchcard.php
diff --git a/application/views/admin/stats/reports.php b/application/views/admin/stats/reports.php
diff --git a/application/views/admin/stats/stats_js.php b/application/views/admin/stats/stats_js.php
diff --git a/application/views/admin/upgrade/upgrade.php b/application/views/admin/upgrade/upgrade.php
diff --git a/application/views/admin/upgrade/upgrade_js.php b/application/views/admin/upgrade/upgrade_js.php
diff --git a/application/views/admin/upgrade/upgrade_status.php b/application/views/admin/upgrade/upgrade_status.php
diff --git a/application/views/admin/upgrade/upgrade_status_js.php b/application/views/admin/upgrade/upgrade_status_js.php
diff --git a/application/views/admin/upgrade/upgrade_table.php b/application/views/admin/upgrade/upgrade_table.php
diff --git a/application/views/admin/users/edit.php b/application/views/admin/users/edit.php
diff --git a/application/views/admin/users/main.php b/application/views/admin/users/main.php
diff --git a/application/views/admin/users/roles.php b/application/views/admin/users/roles.php
diff --git a/application/views/admin/users/roles_js.php b/application/views/admin/users/roles_js.php
diff --git a/application/views/admin/users/users_js.php b/application/views/admin/users/users_js.php
diff --git a/application/views/admin/utils_js.php b/application/views/admin/utils_js.php
diff --git a/application/views/main_js.php b/application/views/main_js.php
diff --git a/media/css/jquery.jqplot.min.css b/media/css/jquery.jqplot.min.css
diff --git a/media/js/jqplot.dateAxisRenderer.min.js b/media/js/jqplot.dateAxisRenderer.min.js
diff --git a/media/js/jquery.jqplot.min.js b/media/js/jquery.jqplot.min.js
diff --git a/media/js/ushahidi.js b/media/js/ushahidi.js
diff --git a/plugins/clickatell/controllers/admin/clickatell_settings.php b/plugins/clickatell/controllers/admin/clickatell_settings.php
diff --git a/plugins/frontlinesms/controllers/admin/frontlinesms_settings.php b/plugins/frontlinesms/controllers/admin/frontlinesms_settings.php
diff --git a/plugins/smssync/controllers/admin/smssync_settings.php b/plugins/smssync/controllers/admin/smssync_settings.php
diff --git a/themes/default/views/alerts/confirm.php b/themes/default/views/alerts/confirm.php
diff --git a/themes/default/views/alerts/main.php b/themes/default/views/alerts/main.php
diff --git a/themes/default/views/alerts/radius.php b/themes/default/views/alerts/radius.php
diff --git a/themes/default/views/alerts/unsubscribe.php b/themes/default/views/alerts/unsubscribe.php
diff --git a/themes/default/views/alerts/verify.php b/themes/default/views/alerts/verify.php
diff --git a/themes/default/views/main/layout.php b/themes/default/views/main/layout.php
diff --git a/themes/default/views/main/map.php b/themes/default/views/main/map.php
diff --git a/themes/default/views/main/timeline.php b/themes/default/views/main/timeline.php
diff --git a/themes/default/views/reports/comments.php b/themes/default/views/reports/comments.php
diff --git a/themes/default/views/reports/comments_form.php b/themes/default/views/reports/comments_form.php
diff --git a/themes/default/views/reports/detail.php b/themes/default/views/reports/detail.php
diff --git a/themes/default/views/reports/detail_custom_forms.php b/themes/default/views/reports/detail_custom_forms.php
diff --git a/themes/default/views/reports/list.php b/themes/default/views/reports/list.php
diff --git a/themes/default/views/reports/main.php b/themes/default/views/reports/main.php
diff --git a/themes/default/views/reports/stats.php b/themes/default/views/reports/stats.php
diff --git a/themes/default/views/reports/submit.php b/themes/default/views/reports/submit.php
diff --git a/themes/default/views/reports/submit_custom_forms.php b/themes/default/views/reports/submit_custom_forms.php
diff --git a/themes/default/views/reports/submit_thanks.php b/themes/default/views/reports/submit_thanks.php