Merge branch '4767_user_fields'

Conflicts:
	xivo-dao/xivo_dao/data_handler/user/model.py
	xivo-dao/xivo_dao/data_handler/user/tests/test_dao.py