Merge branch 'master' of git://github.com/Dimox/formStyler

Conflicts:
	jquery.formstyler.js