Merge branch '4767_user_fields'

Conflicts:
	xivo-restapi/acceptance/features_1_1/users.feature
	xivo-restapi/xivo_restapi/resources/users/tests/test_actions.py