undefined $j fix

Use correct jQuery wrapper.
Merge branch 'develop'