user edit view extended
Merge branch 'User' of github.com:azapps/sachsenkader into User
Merge branch 'Design' into User

Conflicts:
	config/locales/en.yml
	db/schema.rb
user model validations
user merged to master