Gemfile.lock update
Make sure we're working with a string
Look up proper attributes for security
Format won't be nil, we convert to string above
Fix issue where user in ACL couldn't download ontology
Merge branch 'staging'

Conflicts:
	Gemfile.lock