Merge branch 'master' of https://github.com/masterX244/Android_Testings

Conflicts:
	app/src/main/java/de/nplusc/cc86/newtest/MainActivity.java