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

Conflicts:
	AndroidManifest.xml
	src/com/buaa/greenlife/views/fragment/VegetableListFragment.java
Merge branch 'master' of https://github.com/woaitqs/GreenLife