add jquery
merge jquery with master