deleted some text
Merge branch 'DEVPull' into DEV

Conflicts:
	res/layout/activity_main.xml