[VP, TP] files reformatted
Merge remote-tracking branch 'origin/master' into Paul
[VP, TP] sync
Merge remote-tracking branch 'origin/master' into Paul
[VP, TP] NokiaScreen & subclasses refactored
[VP, TP] files reformatted
[VP, TP] sync
[VP, TP] NokiaScreen & subclasses refactored
Merge remote-tracking branch 'origin/master' into Paul
[VP, TP] changes order of abstract methods
[VP, TP] BatteryIndicator blinking added
Merge remote-tracking branch 'origin/master' into Ventu

Conflicts:
	NokiaPhoneSimulator/src/com/example/screen/StartScreen.java