new stuff
changed the jquery script
Merge remote-tracking branch 'origin/master'

Conflicts:
	Testing/App_Data/StarterSite.sdf
Revert "changed the jquery script"

This reverts commit b4634e0a7464c7401f7e86fb2799ed5d831f0c36.
new additions