main conflict
Merge branch 'master' of https://github.com/thju1011/KneipenApp.git

Conflicts:
	res/layout/main.xml
Merge branch 'master' of https://github.com/thju1011/KneipenApp.git

Conflicts:
	res/layout/main.xml