date-time-picker
Merge branch 'master' of https://github.com/goldrush/goldrush

Conflicts:
	app/controllers/delivery_mails_controller.rb
Merge pull request #89 from qtamaki/master

pull pull