update js
Merge branch 'master' of https://github.com/samueljoos/drujax

Conflicts:
	sites/all/modules/drujax/js/drujax.js