Made changes again.
blah
Merge remote-tracking branch 'origin/master' into Momo

Conflicts:
	RadyNavigationApp/bin/classes/com/example/radynavigationapp/MainActivity.class