Fixing my strings conflict

Conflicts:
	project.properties
	res/values/strings.xml
Changed the menu settings button back to take the user to the settings
activity. It was linked to cacheList_activity and would crash the app.