WIP building setting delivery time ui.
Merge branch 'master' of github.com:dbenamy/monkey-shit

* 'master' of github.com:dbenamy/monkey-shit:
  removing lines
  adding validation for the rss feed

Conflicts:
	app/models/subscription.rb