content type for png images returned
Merge branch 'development' of github.com:opentox/compound into development

Conflicts:
	application.rb