adding papperclip tu users
Merge branch 'paperclip'

Conflicts:
	config/locales/de.yml
	config/locales/devise.de.yml
	config/locales/simple_form.de.yml