have `children()` ignore null argument
Update ajax.js

jquery's jsonpcallback settings
fix $.trim() for null and undefined
improve $.trim() tests
bump CoffeeScript to avoid build script hanging

Closes #782, see jashkenas/coffee-script#2523
Allow Zepto to work with jQuery in noConflict mode

* Check that window.$ is undefined rather than whether $ is a property
 of window.
* jQuery in noConflict mode sets window.$ to undefined which was causing
  Zepto to not be assigned
iPod and webview detection
iPhone reported true when actually running on iPod fix
iPhone reported true when actually running on iPod fix -> improved
tests fixed
Make syntax more consistent
Merge pull request #796 from sharethrough/master

Allow Zepto to work with jQuery in noConflict mode
a few changes to increase jQuery compatibility.
testing jquery compatibility of method val, text and html.
Add Android 4.3/Nexus 4 detection test
Add detection for Safari
Remove spurious console.log, fixes #803
Merge pull request #772 from ydream/patch-1

Add jsonpCallback option
Tests for jsonp and jsonpcallback options, see #772
Merge branch 'pr/798'

Conflicts:
	src/detect.js
	test/detect.html