Merge branch 'develop' of https://github.com/ushahidi/Ushahidi_Web

2.7.4 Beta

Merge pull request #1355 from ushahidi/develop

Closes #1354. Fix SQL Syntax breaking 2.7.3 installs

fixed sql syntax

2.7.1 - Bug Fix Release

update Changelog

New version number is 2.7, Bamako

Security release - fixes forgotten password challenge issue

New version number is 2.6, Tripoli