[VP, TP] files reformatted
[VP, TP] sync
[VP, TP] NokiaScreen & subclasses refactored
Merge remote-tracking branch 'origin/master' into Paul