[VP, TP] Clock refactored
[VP, TP] Clock refactored to BroadcastReceiver
[VP, TP] solved conflicts