Fix T331
Merge branch 'master' of github.com:ushahidi/Lamu