更新
Merge branch 'master' of https://github.com/lohuvie/zhaibuqi
activity
Merge pull request #8 from lohuvie/master

merge
update
Merge branch 'master' of https://github.com/willkan/zhaibuqi
upload
asd
upload_picture
asdf
personal-info-preview
delete rubbish
Merge branch 'master' of https://github.com/lohuvie/zhaibuqi

Conflicts:
	.idea/workspace.xml

	modified:   activity.php
	modified:   new-activity.php
	modified:   php/new_activity.php
	modified:   php/upload_picture.php
	new file:   upload-images/1362890286.png
	new file:   upload-images/1362890412.png
	new file:   upload-images/1362890600.png
	new file:   upload-images/1362891031.png
	new file:   upload-images/1362891239.png
	new file:   upload-images/1362891548.png
	new file:   upload-images/1362891568.png
	new file:   upload-images/1362891827.png
	new file:   upload-images/1362891847.png
	new file:   upload-images/1362892000.png
	new file:   upload-images/1362892113.png
	new file:   upload-images/1362893205.png
	new file:   upload-images/cut_1362891847.png
	new file:   upload-images/cut_1362892000.png
	new file:   upload-images/cut_1362892113.png
	new file:   upload-images/cut_1362893205.png
Merge pull request #16 from willkan/master

merge
checkpassword js
Merge pull request #17 from willkan/master

checkpassword js
Merge branch 'master' of https://github.com/lohuvie/zhaibuqi

Conflicts: