Part of upload document in a group
Merge branch 'master' of https://github.com/mikegiberson/CencolShare

Conflicts:
	src/main/resources/application.properties