fix jquery element error
merge

Conflicts:
	extensions/angoose-ui/directives/ang-render.js