Bug Fix;
Merge branch 'master' of https://github.com/woaitqs/GreenLife

Conflicts:
	src/com/buaa/greenlife/views/custom/VegeCustomListAdapter.java
	src/com/buaa/greenlife/views/fragment/VegetableListFragment.java