Merge remote-tracking branch 'ushahidi/master' into api-posts. Closes #22

Conflicts:
	install/sql/ushahidi.sql