Content updates
Merge branch 'gh-pages' of https://github.com/ushahidi/docs.ushahidi.com into gh-pages

Conflicts:
	_posts/2_strategy/2014-07-20-strategy-crowdsourcing.md
updates for st
Merge branch 'gh-pages' of https://github.com/ushahidi/docs.ushahidi.com into gh-pages