updated jquery + added noconflict file