Time foramt
Merge branch 'master' of https://github.com/Minkyu-Jeon/cofilter

Conflicts:
	test3/config/initializers/time_formats.rb