Merge branch 'server' of github.com:jupl/cinder-brunch