Merge branch 'master' into until_time_input

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/recurring_select.js.coffee
	recurring_select.gemspec