remove some craps
Merge branch 'master' into develop

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml