document management
Merge branch 'master' into documents
icon on button
fix document
last fixes for documents before 1.7
Merge branch 'documents' into version_1_7

Conflicts:
	app/views/layouts/groups.html.erb
	config/routes.rb
	db/schema.rb