fix users
Merge branch 'hotfix/fix_users_show_index'

* hotfix/fix_users_show_index:
  fix users
Merge branch 'hotfix/fix_users_show_index' into develop

* hotfix/fix_users_show_index:
  fix users

Conflicts:
	app/views/web/users/index.html.haml
add user pic to users_index
add user_pic decorator method
add user_pic every_where
Merge branch 'hotfix/add_default_user_pic' into develop

* hotfix/add_default_user_pic:
  add user_pic every_where
  add user_pic decorator method
  add user pic to users_index

Conflicts:
	app/decorators/user_decorator.rb
	app/views/web/user_lectures/index.html.haml
	app/views/web/welcome/_lectors.html.haml