v24
Merge branch 'master' into dd

Conflicts:
	SwEngTutorial/src/com/example/swengtutorial/MainActivity.java