Updated bootstrap datepicker version
Move resources into the templates that use them to prevent conflicts