[guadec-web: 2/3] Merge branch 'master' into map

[Oliver Gutiérrez <ogutierrez src gnome org>]

commit a7312042ad20244f01eee05d235475566744ebff
Merge: fcb5316 be6484f
Author: Jorge Sanz <xurxosanz gmail com>
Date:   Thu Jul 5 18:48:17 2018 +0200

    Merge branch 'master' into map

 content/documents/schedule.xml               |   2 +-
 content/images/640px-Universidad_almeria.jpg | Bin 0 -> 73171 bytes
 content/pages/code-of-conduct.md             |  18 -----
 content/pages/map.md                         |   9 +++
 content/pages/schedule.md                    |  21 +++---
 content/pages/social-events.md               |  12 ++--
 content/pages/venue.md                       |  97 +++++++++++++++++----------
 7 files changed, 86 insertions(+), 73 deletions(-)
---