fix
Merge branch 'master' of https://github.com/larcara/documentale

Conflicts:
	app/models/document.rb