some fixs
Merge branch 'some_fixs'

Conflicts:
	Cheffile.lock
	roles/web.rb