zuckay/Done file write+popup another page/
Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/gen/com/example/emulator/EmulatorAIDL.java