Merge pull request #1381 from phrawzty/master

initial commit for Paris 2015
Map updates.
Merge pull request #1382 from bridgetkromhout/master

Map updates.
add CoC (en)