merge
Merge branch 'master' of https://github.com/Overu/AndroidTest.git

Conflicts:
	test1/src/main/java/com/androidtest/test1/UC.java