Rough escaping on report title, location and submitter
Add some extra escaping on comments, and escape report title in comment admin
More escaping on messages view - not sure if this works yet.
Fix alerts error on smssync
Merge branch 'hotfix/xss-username' into develop
Fix custom forms visibility - all fields were showing regardless of the selected form #235 #234
Slightly better tool tip for access_level
Update version.php
Update db_version in ushahidi.sql to match previous changes
Add radius layer functionality to ushahidi.js & cleanup settings JS

* The JS for the alerts page now sits on top of ushahidi.js. There is
now an updateAlertCoordinates function that is subscribed to the
'markerpositionchanged' event so that the alert coordinates (lat/lon)
can be updated on the alerts subscription form each time alert center
shifts

* The background of the popups is now preloaded when the map is
initialized as opposed to when the feature is selected. This ensures
that it is cached in advance; before adding any layers on the map

* Renamed the "REPORTS" layer type to GEOJSON so that it reflects the
type of data associated with the layer; mnemonics. In line with this
norm, the "defaultMarkerStyle" property has also been renamed to
"GeoJSONStyle"

* Cleaned up the settings_js file and delegated the map functionality
to ushahidi.js. This required adding extra API methods to handle
adjustment of the zoom level via the slider, change of default country
and base layer
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Coding style fix and source tree cleanup

* The feeds controllers (feed.php and feeds.php) were using spaces
instead of tabs

* Removed unnecessary view files from the source tree. These are either
unused or only have a single property to be set by the controller in
which case it makes sense to just echo the property from the controller
e.g. the view used by the json controller

* Additional reorganization of the view files - grouping them per
controller and moving them to the themes directory
Closes #514 . Added missing i18n string on admin reports submissio page + getting rid of information evaluation section on members module since it was moved to a plugin
Closing #519. Proper reference to views based on recent changes
Closes #522 . Adding db version to API version task
Fix on the cancel button in confirming action on forms
Minor error due to typo
Replace strtoupper() calls with utf8::strtoupper(). Closes #524

Conflicts:

	application/views/admin/checkins.php
	themes/internewscar/views/reports_submit.php
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Accommodate rendering of checkins in the new mapping script

* The main_js file is now much cleaner - devoid of OpenLayers code; all
this is in ushahidi.js. The data from the checkins API call is now
passed onto a callback function in main_js that formats it into a JSON
object which is then parsed into an array of OpenLayer.Feature.Vector
objects by the addLayer function ins ushahidi.js

* The checkins API - for fetching checkins - has been refactored so
that the each checkin entry includes a user object that contains all
the user's data (name, color etc). It doesn't make much sense to split
the payload between checkins and users

* I've removed the checkins listing from the sidebar on the main page.
The plan is to implement that listing (among others) using Backbone JS