small refactoring, added scripts for Openmandriva
Tweak lxc-template as an attempt to make it compatible with Ubuntu 13.10 [GH-150]
Merge pull request #167 from avokhmin/openmandriva

small refactoring, added scripts for Openmandriva
Merge branch 'master' into v0.6.4-abf-worker-service

Conflicts:
	boxes/build-openmandriva-box.sh
	boxes/common/lxc-template-openmandriva