new branch
Merge branch 'master' into kenBranch

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	Localize/src/com/tracme/localize/MainActivity.java

conflicts fixed
Update MainActivity.java

getting rid of stupid merge issue notifications
Update main.xml
Update strings.xml
Update MainActivity.java
Merge remote-tracking branch 'origin/master' into kenBranch

Conflicts:
	Localize/src/com/tracme/localize/MainActivity.java
Adding point/toggle menu item in settings
Adding follow mode and animation. I really hope there arent any issues with this
Merge branch 'master' into kenBranch

Conflicts:
	Localize/res/layout/activity_two.xml
	Localize/src/com/tracme/localize/LocalizeDisplay.java
	Localize/src/com/tracme/localize/MainActivity.java