$ replaced by jquery
Merge branch 'development'