Merge branch 'hotfix/bootstrap_timepicker'
round two of fixing heroku timepicker css snafu
Merge branch 'hotfix/bootstrap_timepicker_2' into develop