[modified] code format
Merge branch 'master' of https://github.com/Nightink/pophoto-web-front

Conflicts:
	src/util/cookie.js
	src/util/fileUpload.js