all activities by start
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/classes/com/testae/MainActivity.class
	bin/proguard.txt
	bin/resources.ap_
	bin/testAE.apk
	gen/com/testae/R.java