modified model
Merge remote-tracking branch 'origin/master'

Conflicts:
	backbone/public/js/models/menu-item.js