fixed issues
Merge branch 'master' of https://github.com/mikegiberson/CencolShare

Conflicts:
	src/main/java/com/cencolshare/controller/DocumentController.java