Fixing conflicts
Merge branch 'master' of https://github.com/meet-projects/howtocrisis-y2-2014