removed jquery ui 1.10
merged master