finished dev for refresh feature
grid refresh bug
Merge branch 'master' into account-aa

Conflicts:
	Resources/models/item_model.js