updating license
Merge branch 'master' of https://github.com/appglu/iscroll

Conflicts:
	dist/iscroll-min.js
	dist/iscroll-zoom-min.js