Add cup sensor, move sensor metadata to the database, rename stateResolver module to aleviate confusion, move sensor displayName into database