#77 reupdate String for way and waypoint activity
#77 adding spiner and new way button (with 2 testing ways)
Merge branch 'master' of https://github.com/bradshoow/SARA.git

Conflicts:
	res/values-en/strings.xml >>>done