Merge branches 'dev' and 'master' into dev
Added the TimeType model.
Added the TimeType conditions for search.
Merge branches 'master' and 'dev'