[AM] {testing} save file,
Merge remote-tracking branch 'origin/master'

Conflicts:
	StudyProgress/bin/classes/com/studyprogress/MainActivity$2.class
	StudyProgress/bin/classes/com/studyprogress/MainActivity.class