Merge branch '8-apple' of https://github.com/zlqhem/CourseATF into 8-apple

Conflicts:
	tests/src/com/example/i2at/tc/test/EditNumberTests.java
Merge branch '8-apple' of https://github.com/zlqhem/CourseATF into 8-apple

Conflicts:
	tests/src/com/example/i2at/tc/test/EditNumberTests.java