Off by one error when translating between location choices and array index
Rebuild
Fixed ushahidi headers
Rebuild
Merge branch 'feature/ushahidi-issue' into develop

Conflicts:
	go-di.js
	src/ushahidi.js