$ replaced by jQuery
Merge branch 'development'