implement portfolio documents controller update
Merge branch 'master' of github.com:DefactoSoftware/BKOUpload

Conflicts:
	spec/models/permission_spec.rb