added DeviceType, AppType, modified TokenService to use DccRepository