Sorry for late commit, only 2 rows( fixed index)
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/views/admin/EmployeeDialogView.js