lock portrait orientation
Merge branch 'something'

Conflicts:
	CharityWorkout/src/com/c1/charityworkout/Screen3.java
add?