Merge branch 'master' of C:\Users\mmewes\androidprojects\Sunshine with conflicts.
Tablet UI starters