T4
Merge branch 'master' into T4

Conflicts:
	Training/src/com/hinyon/t1/MainActivity.java
GIT
Rebase Test
GIT
rebase
Rebase