Fixed infinite loop on "setEventHandlers"
Merge remote-tracking branch 'origin/Zac-Testing'

Conflicts:
	Server_Files/js/jQuery.ei.lib.js
Merge remote-tracking branch 'origin/master' into Zac-Testing