small changes
Merge branch 'master' of github.com:KMPgroup/chef-rails

Conflicts:
	roles/users.json