Merge branch 'hotfix/redirect_after_auth'

* hotfix/redirect_after_auth:
  fix routing to member page
some changes
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
add ticket controller
remove show member view
add ticket_path
Merge branch 'hotfix/member_number_routes' into develop

* hotfix/member_number_routes:
  add ticket_path
  remove show member view
  add ticket controller
  some changes