updating noConflict in boilerplate for every control
Merge pull request #318 from vernak2539/updating_boilerplate_rnd_2

updating noConflict in boilerplate for every control
scheduler day dropdowns need to have 31 days
Merge remote-tracking branch 'upstream/2.5.0-wip' into scheduler
updating scheduler boilerplate for consistency