Merge branch 'master' of github.com:flaviosilveira/Jquery-Price-Format

Conflicts:
	example/jquery/index.html
Merge branch 'master' of github.com:flaviosilveira/Jquery-Price-Format