update
Merge branch 'master' of https://github.com/hoosin/funPlus

Conflicts:
	funPlus.user.js