Agenda-started
Merge branch 'master' of ssh://github.com/j0ju/LbaaS.ffg2014