older versions
Merge remote-tracking branch 'origin/master'

Conflicts:
	older versions/jig.gs.jquery.1.0