Merge branch 'dev' of git://github.com/lxcenter/hypervm into dev

Conflicts solved:
	hypervm-install/hypervm-linux/lxins.php
	hypervm/file/openvz.repo
	hypervm/httpdocs/htmllib/filecore/lighttpd.conf