resolved merge conflict, code lint
fixed theme class
jquery 1.9
Merge pull request #1 from farin/master

bugs fixed and proper jQuery 1.9 support