Merge branch 'debian' of www.project-moonshot.org:/srv/git/moonshot-ui into debian