Merge
test
Merge branch 'master' into Michael

Conflicts:
	MR/LocationViewController.m
UI Major Update