add fields to accounts/edit form
Form imoroved.
Merge branch 'feature/add_events_crud_and_create_event_page' into staging
Merge branch 'develop' into staging
Merge branch 'feature/add_events_crud_and_create_event_page' into staging
Merge branch 'feature/110_change_private_office' into staging

Conflicts:
	app/views/web/accounts/_form.html.haml
add fields to accounts/edit form
Form imoroved.
Merge branch 'staging' of github.com:kaize/nastachku into staging
Merge branch 'feature/110_change_private_office' into staging

Conflicts:
	app/views/web/accounts/_form.html.haml