gg
Merge branch 'master' of https://github.com/kyun2/bpmanager

Conflicts:
	bin/R.txt
	bin/classes/com/example/bpmanager/BPViewFragment.class
	bin/classes/com/example/bpmanager/ClinicFragment$1.class
	bin/classes/com/example/bpmanager/ClinicFragment$2.class
	bin/classes/com/example/bpmanager/ClinicFragment.class
	bin/classes/com/example/bpmanager/DataFragment.class
	bin/classes/com/example/bpmanager/DateTimePicker.class
	bin/classes/com/example/bpmanager/HabitFragment$1$5.class
	bin/classes/com/example/bpmanager/HabitFragment$1$6.class
	bin/classes/com/example/bpmanager/HabitFragment$1.class
	bin/classes/com/example/bpmanager/HabitFragment.class
	bin/classes/com/example/bpmanager/HabitNotiFragment.class
	bin/classes/com/example/bpmanager/HomeFragment.class
	bin/classes/com/example/bpmanager/InputBPFragment$1.class
	bin/classes/com/example/bpmanager/InputBPFragment$2.class
	bin/classes/com/example/bpmanager/InputBPFragment.class
	bin/classes/com/example/bpmanager/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/bpmanager/MainActivity.class
	bin/classes/com/example/bpmanager/MedicationFragment.class
	bin/classes/com/example/bpmanager/PrivacyDialogFragment.class
	bin/classes/com/example/bpmanager/PrivacyFragment$1.class
	bin/classes/com/example/bpmanager/PrivacyFragment.class
	bin/classes/com/example/bpmanager/R.class
	bin/classes/com/example/bpmanager/UserFragment$1.class
	bin/classes/com/example/bpmanager/UserFragment$2.class
	bin/classes/com/example/bpmanager/UserFragment.class
	bin/classes/com/example/bpmanager/UserMenuFragment$1.class
	bin/classes/com/example/bpmanager/UserMenuFragment.class
	bin/classes/com/example/bpmanager/UserModifyFragment$1.class
	bin/classes/com/example/bpmanager/UserModifyFragment$2.class
	bin/classes/com/example/bpmanager/UserModifyFragment.class
	bin/classes/com/example/bpmanager/bpAdapter.class
	gen/com/example/bpmanager/R.java
	res/layout/fragment_inputbp.xml
	src/com/example/bpmanager/BloodPressure.java