Add timestamp column to eps table in database
Add timeout support for eps that stay in the database (and never get subs)
Fix merge conflicts