resolved merge conflict, code lint
fixed theme class
jquery 1.9