Merge branch 'hotfix/jan_content_updates_2'
Merge branch 'release/rebrand.1'
Deleted 2013-01-31-your-filename.md
creating new page in prose
Deleted prose.html
Updated prose.php
Deleted prose.php
Merge branch 'release/removals'
Merge branch 'master' of github.com:dance4peace/dance4peace.org
Merge branch 'master' of github.com:movethisworld/movethisworld.org into develop