Add a missing function
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Add php 5.4 support
Getting gallery page to work
Fix issue with tagging media to an existing report via the API
Add suppport for filtering gallery by media type
Simplify js code for getting media type
add lightbox support
Fix merge conflict