push test 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	SRM/src/com/srm/MainActivity.java