Resolving conflict

Changed date time from rails to jquery date time picker