Remove jquery, window onload added.
Merge branch 'develop'