cleanup
Removed external jQuery dependency
Merge branch 'develop'