downgraded jquery-ui. Datepicker not working on version 10
Merge branch 'master' into feature_merge