merge branch ubuntu-13.10
Merge branch 'ubuntu-14.04' of github.com:theqvd/qvd-lxc-templates into ubuntu-14.04

Conflicts:
	lxc-qvd-ubuntu