Added field numvotes on model event and update atribute type for kind
fixed merges bug
Fixed models and views