fixed some issues with merge conflicts (first attempt)
Merge pull request #18 from zrivest/jquery_merge_check

fixed some issues with merge conflicts (first attempt)