Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/appTwimpi.apk
	bin/classes.dex

	bin/classes/com/example/apptwimpi/CenterActivity$PlaceholderFragment.class
	bin/classes/com/example/apptwimpi/CenterActivity.class
	src/com/example/apptwimpi/CenterActivity.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 76017fb756637154a063bf06a65e81aa73e260d6.