fix versionning
Merge branch 'master' into support_1.0

* master:
  fix versionning

Conflicts:
	attributes/default.rb
	recipes/deb.rb