changing css timer
Merge branch '1-3-stable'
Merge branch 'master' of github.com:suryart/spree_active_sale