test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
opennebula changes
backup node
backup storage
Merge branch 'master' of https://github.com/thomasalrin/nilavu into thomasalrin-master

Conflicts:
	Gemfile.lock
Merge branch 'thomasalrin-master'
Merge remote-tracking branch 'origin/master'