Merge branch 'hotfix_fix_schedule_height_script'
Merge branch 'hotfix_fix_schedule_height_script'
Merge branch 'hotfix_fix_schedule_height_script'
Merge branch 'hotfix_fix_schedule_height_script'
edit link on sponsor
Merge branch 'develop'
add partner
add sponsor
Merge branch 'hotfix/sponsors6'

* hotfix/sponsors6:
  add sponsor
  add partner
  edit link on sponsor
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix layout
  fix ruby-version
  fix icon top
  fix default photo
  remove to ruby-version
  add .rvmrc
  some fix
  and one fix
  some fix
  fix height
  fix schedule hall
  fix rails v
  fix deploy file
  fix rails version
edit banner
remove images
review account form
add conditiions for new banner
Merge branch 'hotfix/edit_banner'

* hotfix/edit_banner:
  add conditiions for new banner
  review account form
  remove images
  edit banner
Merge branch 'develop'
fix schedule js
Merge branch 'hotfix_fix_schedule_js' into develop