Merge branch 'master' of github.com:flaviaza/doctrackr-salesforce

Conflicts:
	app/views/documents/new.html.erb