Begin of folder sharing
Merge branch 'master' of https://github.com/Kinokoh/googleDriveFaces

Conflicts:
	src/main/webapp/files.xhtml