Update
Merge branch 'master' of https://github.com/ohanematsu/mr_fit_v1

Conflicts:
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/mr_fit_v1/FriendFragment.class
	bin/classes/com/example/mr_fit_v1/FriendsActivity.class
	bin/classes/com/example/mr_fit_v1/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/mr_fit_v1/MainActivity.class
	bin/classes/com/example/mr_fit_v1/MapActivity.class
	bin/classes/com/example/mr_fit_v1/R$id.class
	bin/classes/com/example/mr_fit_v1/R$layout.class
	bin/classes/com/example/mr_fit_v1/R$menu.class
	bin/classes/com/example/mr_fit_v1/R$string.class
	bin/classes/com/example/mr_fit_v1/R$style.class
	bin/classes/com/example/mr_fit_v1/R$styleable.class
	bin/classes/com/example/mr_fit_v1/R$xml.class
	bin/classes/com/example/mr_fit_v1/ReportActivity.class
	bin/classes/com/example/mr_fit_v1/ReportFragment.class
	bin/classes/com/example/mr_fit_v1/SearchFriendActivity.class
	bin/classes/com/example/mr_fit_v1/SecondActivity.class
	bin/classes/com/example/mr_fit_v1/SecondFragment.class
	bin/classes/com/example/mr_fit_v1/SettingsActivity.class
	bin/classes/com/example/mr_fit_v1/StatisticsFragment.class
	bin/classes/com/example/mr_fit_v1/TabsFragmentActivity.class
	bin/classes/com/example/mr_fit_v1/TrackerActivity.class
	bin/classes/com/example/mr_fit_v1/TrackerFragment.class
	bin/classes/com/example/mr_fit_v1/TrackerSecondaryActivity$PlaceholderFragment.class
	bin/classes/com/example/mr_fit_v1/TrackerSecondaryActivity.class
	bin/classes/tabs/Tab1Fragment.class
	bin/classes/tabs/Tab2Fragment.class
	bin/classes/tabs/Tab3Fragment.class
	gen/android/support/v7/appcompat/R.java
	gen/com/example/mr_fit_v1/R.java