Merge pull request #1 from asm-products/master

merge
User Time Preference

Added columns for User Time preferences
Set up Clockwork and Sidekiq

Added columns for User Time preferences
Set up Clockwork and Sidekiq

Added columns for User Time preferences
Set up Clockwork and Sidekiq
fix merge conflicts