Merge branch 'master' of https://github.com/teamdf/jquery-number into work

Conflicts:
	jquery.number.js