set orientation based on whether it's a tablet or not
Merge remote-tracking branch 'origin/master'