Edit item tab 1 designed
Merge branch 'master' of https://github.com/Thunderstick-Android-Project/Thunderstic-medicare
abc
Conflicts:
	MedReminder/bin/MedReminder.apk
	MedReminder/bin/R.txt
	MedReminder/bin/classes.dex
	MedReminder/bin/classes/android/support/v7/appcompat/R$layout.class
	MedReminder/bin/classes/com/thunderstick/medreminder/MainActivity.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$id.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$integer.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$layout.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$menu.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$string.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$style.class
	MedReminder/bin/classes/com/thunderstick/medreminder/R$styleable.class
	MedReminder/bin/jarlist.cache
	MedReminder/bin/resources.ap_
	MedReminder/gen/android/support/v7/appcompat/R.java
	MedReminder/gen/com/thunderstick/medreminder/R.java
Error recover