Merge branch 'hotfix/update_readme'

* hotfix/update_readme:
  update readme
Merge branch 'release/v16.1'

* release/v16.1:
  update gems #2. with fix capistrano
Merge branch 'release/v16.2'

* release/v16.2:
  update bootstrap styles
Merge branch 'release/v16.3'
Merge branch 'develop'

* develop: (34 commits)
  add photos to news
  add logo.png to root dir
  add photos to news
  only 2013 news puts in welcome
  formed locales files
  edit copyright
  edit organizers
  add twitter widget
  add social icons
  remove icq and jabber
  add locales
  add question
  add reason to member
  remove all patronymic
  remove trash and add social
  formed date_select
  add localization
  add birthdate validation
  add rvm 2.0.0 to travis
  replace somethng
  ...
predeploy commit #SHITCODE :(
Update Gemfile
many changes
Merge branch 'master' of github.com:ulmic/deadline_camp

* 'master' of github.com:ulmic/deadline_camp:
  Update Gemfile

Conflicts:
	Gemfile
edit readme
remove web/sessions_controller_testo
add codeclimate to README
add coveralls
edit coveralls
Delete Gemfile.lock
fix make_up in navbar
edit 	skill levels
add new questions to member
add first_deadline_view
add news to deadline 2012