hhh
Merge branch 'master' of https://github.com/tcmaster/OurProject

Conflicts:
	Joocola/res/drawable-hdpi/boy.png
	Joocola/res/drawable-hdpi/girl.png
	Joocola/res/drawable-hdpi/issue_location.png
	Joocola/res/drawable-hdpi/issue_time.png
	Joocola/res/drawable-mdpi/boy.png
	Joocola/res/drawable-mdpi/girl.png
	Joocola/res/drawable-mdpi/issue_location.png
	Joocola/res/drawable-mdpi/issue_time.png
	Joocola/res/drawable-xhdpi/boy.png
	Joocola/res/drawable-xhdpi/girl.png
	Joocola/res/drawable-xhdpi/issue_location.png
	Joocola/res/drawable-xhdpi/issue_time.png
	Joocola/res/drawable-xxhdpi/boy.png
	Joocola/res/drawable-xxhdpi/girl.png
	Joocola/res/drawable-xxhdpi/issue_location.png
	Joocola/res/drawable-xxhdpi/issue_time.png