Merge branch 'master' of https://github.com/Domethic/Test

Conflicts:
	A/src/com/example/applicationtest/MainActivity.java