Fixing orientation
Merge branch 'master' of https://github.com/tonjeb/Assignment2
Fixed showactivity