jquery 2
Merge remote-tracking branch 'upstream/master'
Merge pull request #21 from solispauwels/master

jquery2