[guadec-web-regcfp/develop: 2/3] Merge branch 'master' into wip/permissions

[Patrick Uiterwijk <puiterwijk src gnome org>]

commit 78566c90e369c6e04eae0b8260b3c502945e81cb
Merge: 247e106 00d7a47
Author: Patrick Uiterwijk <puiterwijk redhat com>
Date:   Mon May 18 14:05:03 2015 +0200

    Merge branch 'master' into wip/permissions

 .gitignore                                  |    2 +
 app.js                                      |    2 +-
 config/{config.json => config.json.example} |    0
 guadec-web-regcfp.doap                      |   29 +++++++++++++++++++++++
 models/index.js                             |    8 +++---
 public/css/style.css                        |    2 +
 public/img/guadec-logo-white.png            |  Bin 0 -> 6999 bytes
 public/javascripts/login.js                 |    9 +++++++
 routes/auth.js                              |   33 +++++++++++++++-----------
 views/layouts/main.hbs                      |    6 ++++-
 10 files changed, 71 insertions(+), 20 deletions(-)
---