Merge pull request #4 from pysherlock/master

World Cup
Merge pull request #3 from alllenwang/master

world cup
sigin change
Merge branch 'master' of https://github.com/alllenwang/PhotoHub
Merge pull request #4 from alllenwang/master

signin change
upload added
Merge branch 'master' of https://github.com/stanleytangerror/PhotoHub
Merge pull request #5 from stanleytangerror/master

upload added
fixed package failure
Merge pull request #6 from stanleytangerror/master

fixed package failure
package changed
merge package
add photo information
add photo information
Merge pull request #5 from alllenwang/master

package merge
Merge pull request #6 from alllenwang/master

add photo info
uplaod fixed
merge photoinfo
protocol finished
Merge pull request #7 from stanleytangerror/master

change upload photoinfo