fix routes
Merge branch 'hotfix/events_to_member_number'

* hotfix/events_to_member_number:
  fix routes
Merge branch 'hotfix/events_to_member_number' into develop

* hotfix/events_to_member_number:
  fix routes
fix routing to member page
Merge branch 'hotfix/redirect_after_auth'

* hotfix/redirect_after_auth:
  fix routing to member page
Merge branch 'hotfix/redirect_after_auth' into develop

* hotfix/redirect_after_auth:
  fix routing to member page
fix tests
add divider
some changes
add programs
add logo to program and program_id to event
add good forms for program and event and put welcome
add people, who worse event
add something to main_page
Merge branch 'feature/main-page' into develop

* feature/main-page:
  add something to main_page
  add people, who worse event
  add good forms for program and event and put welcome
  add logo to program and program_id to event
  add programs
Merge branch 'develop'

* develop:
  add something to main_page
  add people, who worse event
  add good forms for program and event and put welcome
  add logo to program and program_id to event
  add programs
  add divider
  fix tests

Conflicts:
	app/views/welcome/index.html.haml