trying again
Merge pull request #1 from nZEDb/dev

Bringing Current
Merge pull request #2 from nZEDb/dev

bring current.
Updated JQuery, Colorbox working, Qtip working
Merge pull request #489 from sinfuljosh/dev

Updated jquery, colorbox, qtip