add photo multiple upload
Merge branch 'master' of github.com:LifeLogTLeaf/LifeLogCollector

Conflicts:
	.DS_Store
	.classpath
	AndroidManifest.xml
	res/layout/activity_photo.xml
	res/layout/activity_share_main.xml
	src/com/tleaf/lifelog/MainActivity.java
	src/com/tleaf/lifelog/model/Photo.java