Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
RELEASE: devhost-vagrant-debian-7-wheezy64_2
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
fix mount
fix mount
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64

Conflicts:
	manage.sh
fix merge
fix init
Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'

Conflicts:
	Vagrantfile