Added button functionality

Added basic functionality for the new button in the main activity screen
Merge branch 'master' of https://github.com/galbrech/HikeFinder

Conflicts:
	res/values/strings.xml