updates
Merge https://github.com/torresda/UshahidiApi-java