[VP, TP] added optionsMenu and calculator

also added some textviews, changed the background image and some minor
refactoring
[VP, TP] solved conflicts
[VP, TP] layout refactored, clock_view added to startscreen
Merge remote-tracking branch 'origin/master' into Paul